Commit Graph

Select branches

Hide Pull Requests

develop

feature/10月迭代优化

feature/20250604_chenye

feature/6679

feature/6684

feature/6686

feature/6694

feature/6711

feature/6763

feature/6973

feature/7119_lxbTest

feature/7134

feature/7141

feature/7151

feature/7154

feature/7229

feature/7230

feature/7231

feature/7248

feature/7249

feature/7253

feature/7254

feature/7254_new

feature/7277

feature/7277_7280

feature/7280

feature/auxiliary_files_upload

feature/backup-develop

feature/commercially_launched

feature/customer_material_optimization

feature/customer_supply

feature/delivery_status

feature/machining_accuracy_sync

feature/manufactur_order

feature/merge-6694

feature/message_update

feature/model_type_update

feature/mrp_bug_fixed

feature/new

feature/new1

feature/new111

feature/org_info_synchronous

feature/part_number

feature/plan_slow

feature/pre-three-elment

feature/process_outsourcing_code_stripping

feature/sale_order_route_pick

feature/sf-master1.0

feature/sf看板样式统一

feature/sync-develop-with-master

feature/tax_sync

feature/tool_standard_library_process

feature/update_process_start_time

feature/update_production_line

feature/wechat_message

feature/weid_sync_update

feature/workorder_exceptions

feature/临时分支

feature/主题logo添加中文

feature/产品的权限优化

feature/仓库发货下发bfm

feature/优化工件配送及AGV

feature/优化报废和返工

feature/优化设备维保标准

feature/优化调拨列表

feature/修改产品名称

feature/修改制造订单列表显示

feature/修改机床参数bug

feature/修改网站标题

feature/制造功能优化

feature/前端样式修改

feature/加工能力显示重叠

feature/取消加工订单

feature/合同审批

feature/坯料尺寸显示修改

feature/增加模块完整性验证

feature/增加质检模块

feature/增加适配开发环境

feature/工单返工优化

feature/打印配置优化

feature/报废优化

feature/搜索优化

feature/新增plm模块

feature/新增坯料类型

feature/新增消息提醒

feature/根据项目组区分sf代码

feature/消息提醒优化

feature/物料需求计划管理

feature/禁止负库存

feature/程序用刀异常提醒

feature/请购明细

feature/调拨单质检

feature/还原产品页面代码

feature/逾期工单批量重新安排

feature/采购申请优化

feature/销售和排程添加消息推送

feature/零件图号名称优化需求

feature/零件图号筛选

feature/需求计划

feature/页面显示优化

feature/验证合并的逻辑

feature/齐套检查与下达生产

hotfix/修复刀具预警没有预警记录和通知

hotfix/修复多面加工产线状态

hotfix/修复工件上下产线接口

hotfix/修复报废-外协入库验证

hotfix/修改agv回调接口授权

hotfix/备注为空

hotfix/解决采购申请bug

master

release/release1.0

release/release1.6

release/release1.7

release/release_1.2

release/release_1.4

release/release_1.5

release/release_1.8

release/release_1.9

release/release_2.0

release/release_2.1

release/release_2.10

release/release_2.11

release/release_2.12

release/release_2.13

release/release_2.14

release/release_2.15

release/release_2.2

release/release_2.3

release/release_2.4

release/release_2.5

release/release_2.6

release/release_2.7

release/release_2.8

release/release_2.9

master_sf_20240518_1.0

master_sf_20240529_1.1

master_sf_20240530_1.2

master_sf_20240604_1.3

master_sf_20240605_1.4

master_sf_20240613_1.5

master_sf_20240617_1.6

master_sf_20240619_1.7

master_sf_20240624_1.8

master_sf_20240701_1.9

master_sf_20240703_2.0

master_sf_20240724_2.1

master_sf_20240724_2.2

master_sf_20240724_2.3

master_sf_20240830_2.4

master_sf_20241011_2.5

master_sf_20241104_2.6

master_sf_20241208_2.7

master_sf_20250107_2.8

master_sf_20250121_2.9

master_sf_20250304_2.10

master_sf_20250401_2.11

master_sf_20250415_2.12

master_sf_20250428_2.13

master_sf_20250509_2.14

master_sf_20250610_2.15

master_sf_20250701_2.16

release_1.3

release_1_1

修复工件上下产线

修复编程单下发接口

Mono Color

• 43c8bbda71 Accept Merge Request #1600: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 09:32:00 +08:00
• e011e4cfd6 解决表面工艺工单完成后，生产入库单未就绪的问题 胡尧 2024-12-05 09:31:06 +08:00
• c8fd2d69bd Accept Merge Request #1599: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 08:37:05 +08:00
• ef1f7b1d08 解决冲突 胡尧 2024-12-05 08:36:48 +08:00
• 5f12976d8f 修改表面工艺外协工单流程 胡尧 2024-12-05 01:33:46 +08:00
• ef60f36c90 修改工艺外协工单 胡尧 2024-12-04 20:42:34 +08:00
• c8ed45b1a7 Accept Merge Request #1598: (feature/manufactur_order -> develop) 廖丹龙 2024-12-04 16:43:58 +08:00
• 57fe68bae8 Merge remote-tracking branch 'origin/feature/manufactur_order' into feature/manufactur_order liaodanlong 2024-12-04 16:42:13 +08:00
• aa32fdcd07 坯料长宽高修改 liaodanlong 2024-12-04 16:41:42 +08:00
• d0d59135e3 Accept Merge Request #1597: (feature/manufactur_order -> develop) 管欢 2024-12-04 16:39:44 +08:00
• 27ec5b1b74 多个制造订单菜单修复 guanhuan 2024-12-04 16:13:55 +08:00
• 2c1caabce6 Accept Merge Request #1596: (feature/界面优化 -> develop) 禹翔辉 2024-12-04 15:41:11 +08:00
• 8f3cd9ff36 Merge branch 'feature/隐藏返工入口' into feature/界面优化 yuxianghui 2024-12-04 15:39:05 +08:00
• 6366904c91 添加客供料入库单的合并选项 yuxianghui 2024-12-04 15:37:58 +08:00
• 7f3e6de127 Accept Merge Request #1595: (feature/制造功能优化 -> develop) 马广威 2024-12-04 12:24:18 +08:00
• 5b43cceb94 计划模块的【制造订单生产计划】页面菜单名称改为【CNC产线计划排程】 yuxianghui 2024-12-04 11:56:38 +08:00
• d933416b2d 处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了” mgw 2024-12-04 11:52:52 +08:00
• e260ef01f0 隐藏销售模块的 快速订单 菜单 yuxianghui 2024-12-04 11:43:02 +08:00
• 0fef3d7a63 Accept Merge Request #1594: (feature/manufactur_order -> develop) 廖丹龙 2024-12-04 10:49:12 +08:00
• dc5c0b1d1e Merge branch 'refs/heads/develop' into feature/manufactur_order liaodanlong 2024-12-04 10:46:38 +08:00
• 9a1cde6abc 表面工艺采购单与调拨单拆分 liaodanlong 2024-12-04 10:45:46 +08:00
• b23589b73d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new111 feature/new111 jinling.yang 2024-12-04 10:41:41 +08:00
• 29864b8bb2 Accept Merge Request #1591: (feature/manufactur_order -> develop) 胡尧 2024-12-04 10:23:35 +08:00
• aa5294f110 Accept Merge Request #1593: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-04 10:23:19 +08:00
• 4387d343b5 处理报错是英文的问题 胡尧 2024-12-04 10:22:50 +08:00
• ff979aa34b Accept Merge Request #1592: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-04 10:17:34 +08:00
• 21af368068 解决外协调拨单不能完成的bug 胡尧 2024-12-04 10:16:30 +08:00
• d6afd556d3 询价单查询 guanhuan 2024-12-03 15:59:10 +08:00
• a36726e26a 询价单查询 feature/model_type_update guanhuan 2024-12-03 15:51:37 +08:00
• 778d2c4ec5 Accept Merge Request #1590: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-03 10:04:29 +08:00
• fff29b36ee Accept Merge Request #1587: (feature/隐藏返工入口 -> develop) 禹翔辉 2024-12-03 10:04:23 +08:00
• fedb79a142 去掉多余的视图 胡尧 2024-12-03 10:03:05 +08:00
• d06816052f Accept Merge Request #1589: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-02 19:48:02 +08:00
• 5739e167f4 修改文件位置 胡尧 2024-12-02 19:46:45 +08:00
• a249548a20 Accept Merge Request #1588: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-02 16:37:26 +08:00
• 7b6538d01e 修改文件位置 胡尧 2024-12-02 16:29:33 +08:00
• 7025bde56e 隐藏手动返工报废入口 yuxianghui 2024-12-02 13:46:20 +08:00
• 3585af0cea Accept Merge Request #1586: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-02 11:03:46 +08:00
• 5406224c6f 调整文件结构 胡尧 2024-12-02 11:02:32 +08:00
• 18ff0bba54 Accept Merge Request #1585: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-02 10:36:36 +08:00
• 7c13e57ea2 调整文件结构 胡尧 2024-12-02 10:36:06 +08:00
• b8605b9a97 Accept Merge Request #1584: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-02 10:07:11 +08:00
• 4baa7a9b44 调整文件结构，解决依赖问题 胡尧 2024-12-02 10:06:11 +08:00
• 3af2f3e03b Accept Merge Request #1583: (feature/前端样式修改 -> develop) 黄焱 2024-11-29 16:27:46 +08:00
• dc68ecb584 计划排程列表和工单列表筛选项和数量显示重叠了 hy 2024-11-29 16:26:32 +08:00
• 421f107728 Accept Merge Request #1582: (feature/制造功能优化 -> develop) 马广威 2024-11-29 15:59:40 +08:00
• 1f1bdd08ed 调整库存概览翻译 mgw 2024-11-29 15:59:04 +08:00
• 47d886ef6d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new111 jinling.yang 2024-11-29 15:55:44 +08:00
• 1a7059aad1 Accept Merge Request #1581: (feature/前端样式修改 -> develop) 黄焱 2024-11-29 14:40:43 +08:00
• 8d461e61b3 甘特图增加判断 hy 2024-11-29 14:37:48 +08:00
• fa0ca83709 Accept Merge Request #1580: (feature/制造功能优化 -> develop) 马广威 2024-11-29 14:33:46 +08:00
• a783f9c271 调整内部转账翻译 mgw 2024-11-29 14:32:58 +08:00
• b4901e89d6 Accept Merge Request #1579: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-29 14:15:06 +08:00
• 6690d3f2cb 权限调整 胡尧 2024-11-29 14:14:14 +08:00
• a7d97f137b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new111 jinling.yang 2024-11-29 11:51:55 +08:00
• 21d6989182 Accept Merge Request #1578: (feature/制造功能优化 -> develop) 马广威 2024-11-29 11:30:30 +08:00
• 97ad3567e3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-29 11:24:50 +08:00
• 22a69df31b 调整计划调度岗对工单的权限 mgw 2024-11-29 11:24:27 +08:00
• c0ad9d8977 Accept Merge Request #1577: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-29 10:49:24 +08:00
• a927d0e9cb 解决单个制造的bug 胡尧 2024-11-29 10:44:48 +08:00
• 42fe08384a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-29 10:08:40 +08:00
• eff09e9b52 Merge branch 'feature/修复外协出入库单' into develop jinling.yang 2024-11-29 10:08:14 +08:00
• 5759ca1ca5 Accept Merge Request #1576: (feature/修复外协出入库单 -> develop) 杨金灵 2024-11-29 10:07:57 +08:00
• 9955157dd3 还原代码 jinling.yang 2024-11-29 10:07:17 +08:00
• d42de42709 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单 jinling.yang 2024-11-29 10:04:23 +08:00
• f6aa07fbe7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-29 10:04:04 +08:00
• a7dc3a1227 修复表面外协 jinling.yang 2024-11-29 10:03:44 +08:00
• 9c5f525e90 Accept Merge Request #1575: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-29 09:45:38 +08:00
• db8bd659c3 处理工单中的工艺外协按钮点击报错的问题 胡尧 2024-11-29 09:45:06 +08:00
• 0dab394d1b Accept Merge Request #1574: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-29 09:00:32 +08:00
• 9a9e47b4ff 解决精坯料计算精度问题，排程加上预留时间 胡尧 2024-11-29 08:59:52 +08:00
• deb2f6ca64 修复采购 jinling.yang 2024-11-28 18:01:29 +08:00
• 5bce9bb816 Accept Merge Request #1573: (feature/坯料制造序号优化 -> develop) 禹翔辉 2024-11-28 17:52:46 +08:00
• ccda6b627d Merge branch 'feature/制造订单状态优化_1' into feature/坯料制造序号优化 yuxianghui 2024-11-28 17:51:22 +08:00
• 20cfbf7230 处理 坯料的制造订单生成的批次序列号不对 的bug yuxianghui 2024-11-28 17:50:12 +08:00
• 805eabd07e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单 jinling.yang 2024-11-28 16:01:11 +08:00
• 649dfe90d6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-28 15:59:31 +08:00
• c42c053d66 修复表面工艺外协及工艺设计 jinling.yang 2024-11-28 15:59:17 +08:00
• d8e51f44ac Accept Merge Request #1572: (feature/制造订单状态优化_1 -> develop) 禹翔辉 2024-11-28 15:54:12 +08:00
• 0b5645496b Merge branch 'feature/工单状态优化_2' into feature/制造订单状态优化_1 yuxianghui 2024-11-28 15:52:31 +08:00
• 2c37dbf5c4 制造订单状态优化 yuxianghui 2024-11-28 15:51:54 +08:00
• cd6dc7a47e Accept Merge Request #1571: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-28 15:42:05 +08:00
• 7362f0cd30 修改坯料冗余描述 胡尧 2024-11-28 15:41:39 +08:00
• de2924883c Accept Merge Request #1570: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-28 15:22:23 +08:00
• 942aa469e3 修改排程逻辑 胡尧 2024-11-28 15:21:54 +08:00
• d57cc59115 修改排程逻辑 胡尧 2024-11-28 15:20:56 +08:00
• f8ff3a18a0 Accept Merge Request #1569: (feature/工单状态优化_2 -> develop) 禹翔辉 2024-11-28 15:11:30 +08:00
• 96171013d6 修改排程 胡尧 2024-11-28 15:10:45 +08:00
• d741d6ccf5 Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2 yuxianghui 2024-11-28 15:09:51 +08:00
• 8ff73d5647 工单状态优化 yuxianghui 2024-11-28 15:09:11 +08:00
• 5d3d04b5d3 Accept Merge Request #1567: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-28 15:05:57 +08:00
• 75ed1a6889 Accept Merge Request #1568: (feature/制造功能优化 -> develop) 马广威 2024-11-28 13:39:47 +08:00
• 9bfbea11db Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-28 13:38:43 +08:00
• 5eea260618 修复仓储岗角色权限问题 mgw 2024-11-28 13:38:14 +08:00
• f1e70d2c66 解决询价单中自动化产线加工的订单不生成编程单的问题 胡尧 2024-11-28 11:36:32 +08:00
• da22cb301e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-28 10:48:28 +08:00
• 2b93f2a253 Merge branch 'feature/修复制造订单-采购单' into develop jinling.yang 2024-11-28 10:46:42 +08:00
• 8ab42ff7da Accept Merge Request #1566: (feature/修复制造订单-采购单 -> develop) 杨金灵 2024-11-28 10:45:25 +08:00
• 9bf57005f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单-采购单 jinling.yang 2024-11-28 10:41:13 +08:00
• a80d498eab 修复制造订单-采购单 jinling.yang 2024-11-28 10:40:48 +08:00