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

4663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jinling.yang
11866629c5 修复工艺设计 2024-11-20 17:56:29 +08:00
yuxianghui
f8f5286568 返工流程优化 2024-11-20 17:34:46 +08:00
胡尧
36908f13d3 Accept Merge Request #1525: (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/1525?initial=true
 2024-11-20 16:53:50 +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
jinling.yang
23da273af1 修复bug和优化制造订单报废 2024-11-20 16:08:27 +08:00
廖丹龙
68fdea4520 Accept Merge Request #1523: (feature/delivery_status -> 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/1523
 2024-11-20 15:32:01 +08:00
liaodanlong
c5ac62060d Merge branch 'refs/heads/develop' into feature/delivery_status 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
 2024-11-20 15:23:07 +08:00
马广威
350cf0a74b Accept Merge Request #1524: (feature/制造功能优化 -> develop) 
Merge Request: 调整采购单查找逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1524?initial=true
 2024-11-20 15:19:08 +08:00
mgw
e204d693cf 调整采购单查找逻辑 2024-11-20 15:18:08 +08:00
mgw
a6422330b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-11-20 12:01:38 +08:00
mgw
230e87a9f1 增加日志输出 2024-11-20 10:29:32 +08:00
jinling.yang
e634e9726f 优化工艺设计显示 2024-11-19 17:56:21 +08:00
liaodanlong
e8d07abe05 人工线下加工工单的计划时间计算优化需求 2024-11-19 14:18:44 +08:00
胡尧
808bbd7b22 Accept Merge Request #1522: (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/1522?initial=true
 2024-11-19 14:18:08 +08:00
胡尧
fabcca1188 排程单过滤掉关联制造订单处于草稿跟工艺设计状态 2024-11-19 14:15:29 +08:00
胡尧
97c8b1dcc1 Accept Merge Request #1521: (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/1521?initial=true
 2024-11-19 11:57:29 +08:00
胡尧
f99a35932f 修改坯料冗余 2024-11-19 11:56:49 +08:00
胡尧
ce7dfdbd36 Accept Merge Request #1520: (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/1520?initial=true
 2024-11-19 09:00:38 +08:00
胡尧
d53f3837c3 增加坯料冗余量 2024-11-19 08:59:52 +08:00
jinling.yang
1cb646ec48 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） 2024-11-18 17:41:10 +08:00
jinling.yang
c73706555f 优化外协采购和出入库单（工艺退回调整） 2024-11-18 17:40:41 +08:00
胡尧
21f961d893 Accept Merge Request #1519: (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/1519
 2024-11-18 15:00:56 +08:00