jinling.yang
|
dd768e938c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
|
2024-11-22 09:41:06 +08:00 |
|
yuxianghui
|
611aa0fe05
|
1、优化客供料入库单的追溯参考字段自动计算方法
|
2024-11-22 09:40:33 +08:00 |
|
马广威
|
73564d574c
|
Accept Merge Request #1538: (feature/制造功能优化 -> develop)
Merge Request: 调整开料要求展示范围
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1538?initial=true
|
2024-11-22 09:24:49 +08:00 |
|
mgw
|
ea5231adff
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-11-22 09:23:59 +08:00 |
|
mgw
|
2b3da48e9b
|
调整开料要求展示范围
|
2024-11-22 09:23:36 +08:00 |
|
jinling.yang
|
2632c4a5a0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-22 09:22:54 +08:00 |
|
胡尧
|
2420987f95
|
Accept Merge Request #1537: (feature/sale_order_route_pick -> develop)
Merge Request: 修改调拨单的追溯参考
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1537
|
2024-11-22 08:57:33 +08:00 |
|
胡尧
|
d80f3c4d5c
|
修改调拨单的追溯参考
|
2024-11-21 17:56:57 +08:00 |
|
jinling.yang
|
5cb726bb2d
|
注释代码
|
2024-11-21 17:45:53 +08:00 |
|
胡尧
|
f6b8fa5665
|
Accept Merge Request #1536: (feature/sale_order_route_pick -> develop)
Merge Request: 增加追踪参考
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1536?initial=true
|
2024-11-21 17:45:10 +08:00 |
|
胡尧
|
113d0abb4b
|
增加追踪参考
|
2024-11-21 17:44:55 +08:00 |
|
胡尧
|
3f3c494f7f
|
增加追踪参考
|
2024-11-21 17:43:50 +08:00 |
|
jinling.yang
|
3632a3f98f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-21 17:43:04 +08:00 |
|
jinling.yang
|
73402d1c5a
|
Merge branch 'feature/工单添加工艺设计id字段' into develop
|
2024-11-21 17:42:22 +08:00 |
|
杨金灵
|
4e41efd423
|
Accept Merge Request #1535: (feature/工单添加工艺设计id字段 -> develop)
Merge Request: 工单添加工艺设计id字段
Created By: @杨金灵
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1535?initial=true
|
2024-11-21 17:42:06 +08:00 |
|
jinling.yang
|
0b931f8255
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单添加工艺设计id字段
|
2024-11-21 17:41:07 +08:00 |
|
jinling.yang
|
b49135f5f9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-21 17:40:26 +08:00 |
|
jinling.yang
|
ed6d28cc21
|
工单添加工艺设计id字段
|
2024-11-21 17:40:04 +08:00 |
|
禹翔辉
|
9857787d5a
|
Accept Merge Request #1534: (feature/返工优化_1 -> develop)
Merge Request: 工单状态优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1534
|
2024-11-21 17:32:57 +08:00 |
|
yuxianghui
|
c6e62f65b6
|
Merge remote-tracking branch 'origin/feature/返工优化' into feature/返工优化_1
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-11-21 17:26:49 +08:00 |
|
jinling.yang
|
6c0b034147
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-21 17:24:19 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
杨金灵
|
de11c57800
|
Accept Merge Request #1533: (feature/优化外协采购和出入库单（工艺退回调整） -> develop)
Merge Request: 优化外协采购和出入库单（工艺退回调整）
Created By: @杨金灵
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1533
|
2024-11-21 17:23:18 +08:00 |
|
jinling.yang
|
d4ff4be32e
|
还原注释代码
|
2024-11-21 17:19:41 +08:00 |
|
jinling.yang
|
48371b01cd
|
还原注释代码
|
2024-11-21 17:13:38 +08:00 |
|
jinling.yang
|
310d8b33df
|
优化制造订单报废
|
2024-11-21 17:12:50 +08:00 |
|
yuxianghui
|
6d61e45028
|
删除无用的模块引用
|
2024-11-21 17:08:40 +08:00 |
|
yuxianghui
|
fff22a74b1
|
工单状态优化
|
2024-11-21 17:02:32 +08:00 |
|
胡尧
|
3588288434
|
Accept Merge Request #1532: (feature/sale_order_route_pick -> develop)
Merge Request: 处理订单客供料的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1532?initial=true
|
2024-11-21 15:48:50 +08:00 |
|
胡尧
|
7408cc00f9
|
处理订单客供料的问题
|
2024-11-21 15:48:17 +08:00 |
|
马广威
|
9b3d1170b0
|
Accept Merge Request #1531: (feature/制造功能优化 -> develop)
Merge Request: 线切割、人工线下加工生成工单异常处理
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1531
|
2024-11-21 15:38:04 +08:00 |
|
mgw
|
a774c74e6a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-11-21 15:36:45 +08:00 |
|
mgw
|
1d53f47488
|
线切割、人工线下加工生成工单异常处理
|
2024-11-21 15:36:16 +08:00 |
|
jinling.yang
|
60cc49238c
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 11:46:54 +08:00 |
|
jinling.yang
|
b415278997
|
优化坯料的制造订单
|
2024-11-21 11:45:48 +08:00 |
|
胡尧
|
ac32494944
|
Accept Merge Request #1530: (feature/sale_order_route_pick -> develop)
Merge Request: 更新模块时不更新初始化数据，修改子MO子为子MO
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1530?initial=true
|
2024-11-21 11:34:11 +08:00 |
|
胡尧
|
8c81315c33
|
更新时不更新初始化数据
|
2024-11-21 11:33:04 +08:00 |
|
yuxianghui
|
1d66c1dbea
|
工单状态优化
|
2024-11-21 11:25:00 +08:00 |
|
jinling.yang
|
085d26669f
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 10:44:51 +08:00 |
|
jinling.yang
|
bb7b72b540
|
优化工序设计
|
2024-11-21 10:44:11 +08:00 |
|
yuxianghui
|
ded0d06f86
|
工单状态方法优化
|
2024-11-21 10:43:22 +08:00 |
|
马广威
|
fe08ee4173
|
Accept Merge Request #1529: (feature/制造功能优化 -> develop)
Merge Request: 工序类型增加项目
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1529?initial=true
|
2024-11-21 10:42:28 +08:00 |
|
mgw
|
25ee849796
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-11-21 10:41:41 +08:00 |
|
mgw
|
bafcf35ac9
|
工序类型增加项目
|
2024-11-21 10:41:07 +08:00 |
|
胡尧
|
cc1455b22c
|
修改制造订单中子MO子为子MO
|
2024-11-21 10:21:18 +08:00 |
|
胡尧
|
1d38334c81
|
Accept Merge Request #1528: (feature/sale_order_route_pick -> develop)
Merge Request: 解决bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1528?initial=true
|
2024-11-21 10:01:01 +08:00 |
|
胡尧
|
13d99b1bcc
|
成品的零件图号修改为零件图号
|
2024-11-21 09:49:12 +08:00 |
|
胡尧
|
269be36d86
|
隐藏制造订单待生产按钮，人工线下加工状态下的功能刀具
|
2024-11-21 09:48:26 +08:00 |
|
胡尧
|
ebd76afb29
|
Accept Merge Request #1527: (feature/sale_order_route_pick -> develop)
Merge Request: 修复不同产品调拨单合并的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1527
|
2024-11-21 09:28:04 +08:00 |
|
胡尧
|
a1807e05db
|
修复不同产品调拨单合并的bug
|
2024-11-21 09:26:23 +08:00 |
|