jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,740 Commits 134 Branches 31 Tags
ef60f36c90d16263766203a536c43c9e25f678c8
Commit Graph

211 Commits

Author SHA1 Message Date
胡尧
ef60f36c90 修改工艺外协工单 2024-12-04 20:42:34 +08:00
胡尧
21af368068 解决外协调拨单不能完成的bug 2024-12-04 10:16:30 +08:00
jinling.yang
d42de42709 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单 2024-11-29 10:04:23 +08:00
yuxianghui
20cfbf7230 处理 坯料的制造订单生成的批次序列号不对 的bug 2024-11-28 17:50:12 +08:00
jinling.yang
805eabd07e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单 2024-11-28 16:01:11 +08:00
jinling.yang
c42c053d66 修复表面工艺外协及工艺设计 2024-11-28 15:59:17 +08:00
胡尧
5d3d04b5d3 Accept Merge Request #1567: (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/1567
 2024-11-28 15:05:57 +08:00
胡尧
f1e70d2c66 解决询价单中自动化产线加工的订单不生成编程单的问题 2024-11-28 11:36:32 +08:00
杨金灵
306d5074f2 Accept Merge Request #1563: (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/1563
 2024-11-28 10:03:05 +08:00
jinling.yang
c22b91f9d9 优化采购：一个制造订单对应一个采购单 2024-11-28 09:59:01 +08:00
胡尧
df146a4b58 成品委外，坯料自加工的制造排程单生成 2024-11-27 15:02:42 +08:00
胡尧
64fdedf726 修改工单开始 2024-11-27 08:37:12 +08:00
胡尧
09a476ffa5 修改子制造订单的销售订单 2024-11-26 11:26:17 +08:00
jinling.yang
074c45aa3d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单问题 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2024-11-26 10:41:30 +08:00
jinling.yang
be408b98de 修复制造订单相关问题 2024-11-25 18:00:06 +08:00
马广威
12cc5fd0d2 Accept Merge Request #1549: (feature/制造功能优化 -> develop) 
Merge Request: 内部调拨单缺少源单据

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1549?initial=true
 2024-11-25 17:25:38 +08:00
mgw
589df289be 内部调拨单缺少源单据 2024-11-25 17:24:14 +08:00
胡尧
7abc88f2c3 Accept Merge Request #1548: (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/1548?initial=true
 2024-11-25 17:19:22 +08:00
胡尧
f318dc758b 测试坯料采购单根据采购类型合并 2024-11-25 17:18:57 +08:00
胡尧
6628e22ac0 Accept Merge Request #1547: (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/1547?initial=true
 2024-11-25 16:46:33 +08:00
胡尧
56dfb98df5 子制造订单增加拍承担 2024-11-25 16:43:46 +08:00
jinling.yang
76cc8845d2 修复工序 2024-11-25 15:40:41 +08:00
yuxianghui
7f5f65f07f Merge branch 'feature/客供料入库单优化' into feature/采购优化 2024-11-25 09:17:40 +08:00
yuxianghui
c45200aaee 采购单优化 2024-11-25 09:04:41 +08:00
jinling.yang
8e11ef6e72 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2024-11-22 17:54:21 +08:00
jinling.yang
33b9c48e87 优化制造订单报废 2024-11-22 17:51:40 +08:00
yuxianghui
77ce078e91 1 2024-11-22 09:52:03 +08:00
yuxianghui
5450c9996f Merge branch 'feature/返工优化_1' into feature/客供料入库单优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2024-11-22 09:46:42 +08:00
yuxianghui
611aa0fe05 1、优化客供料入库单的追溯参考字段自动计算方法 2024-11-22 09:40:33 +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
胡尧
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
杨金灵
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
310d8b33df 优化制造订单报废 2024-11-21 17:12:50 +08:00
胡尧
a1807e05db 修复不同产品调拨单合并的bug 2024-11-21 09:26:23 +08:00
jinling.yang
11866629c5 修复工艺设计 2024-11-20 17:56:29 +08:00
胡尧
a7ed317b09 修改订单客供料显示，修改内部调拨、生产发料合并单据 2024-11-20 16:53:15 +08:00
jinling.yang
fe4346b802 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） 2024-11-20 16:08:54 +08:00
胡尧
f99a35932f 修改坯料冗余 2024-11-19 11:56:49 +08:00
胡尧
d53f3837c3 增加坯料冗余量 2024-11-19 08:59:52 +08:00
jinling.yang
c73706555f 优化外协采购和出入库单（工艺退回调整） 2024-11-18 17:40:41 +08:00
杨金灵
0f26cac68d Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整 2024-11-18 11:43:12 +08:00
jinling.yang
45c96276ff 还原代码 2024-11-18 11:42:35 +08:00
jinling.yang
a2855f1f08 还原代码 2024-11-18 11:40:24 +08:00
jinling.yang
9671efeced 外协出入库修复 2024-11-18 11:24:32 +08:00
胡尧
73aa4af118 增加依赖 2024-11-18 10:54:48 +08:00
胡尧
bc0b8bdecb 增加坯料冗余量，调整坯料客供料的名称 2024-11-18 09:44:50 +08:00
jinling.yang
a8e9fe40ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/views/mrp_production_addional_change.xml
 2024-11-15 18:08:31 +08:00