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

6792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
guanhuan
c14e2c19bf 物料需求计划管理 2025-06-26 11:13:56 +08:00
胡尧
c630074f4a Accept Merge Request #2262: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 撤回_run_manufacturing方法

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2262?initial=true
 2025-06-26 10:27:04 +08:00
胡尧
4bea169327 撤回_run_manufacturing方法 2025-06-26 10:26:39 +08:00
禹翔辉
e2ddac4fb0 Accept Merge Request #2261: (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/2261
 2025-06-26 10:24:21 +08:00
yuxianghui
e52ec3982f 调拨单验证时，对没有完成通过的质检单不进行出厂检验报告检测 2025-06-26 10:03:19 +08:00
胡尧
160bd117b7 Accept Merge Request #2260: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 没有model_id的制造订单不请求编程

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2260
 2025-06-26 09:35:42 +08:00
胡尧
a19cf5d894 解决冲突 2025-06-26 09:35:26 +08:00
胡尧
885064fb12 没有model_id的制造订单不请求编程 2025-06-26 09:29:02 +08:00
胡尧
8f7e785760 Accept Merge Request #2259: (feature/根据项目组区分sf代码 -> develop) 
Merge Request: 修复加工面报错的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2259?initial=true
 2025-06-25 17:36:14 +08:00
胡尧
8123885c71 修复加工面报错的问题 2025-06-25 17:35:18 +08:00
禹翔辉
c2f346571d Accept Merge Request #2258: (feature/委外加工采购订单 -> develop) 
Merge Request: 完成 委外加工采购订单增加BOM内物料的采购申请与采购订单 需求

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2258
 2025-06-25 16:13:04 +08:00
yuxianghui
e3494ce8b7 完成 委外加工采购订单增加BOM内物料的采购申请与采购订单 需求 2025-06-25 16:09:32 +08:00
guanhuan
413cf43ea0 物料需求计划管理 2025-06-25 15:33:24 +08:00
guanhuan
deda36a0f9 物料需求计划管理 2025-06-25 15:01:02 +08:00
禹翔辉
d75cff0a5d Accept Merge Request #2257: (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/2257
 2025-06-25 14:37:28 +08:00
guanhuan
8a953a1417 Merge branch 'refs/heads/feature/库存路线' into feature/物料需求计划管理 
# Conflicts:
#	sf_demand_plan/__manifest__.py
#	sf_demand_plan/models/sf_production_demand_plan.py
#	sf_demand_plan/security/ir.model.access.csv
 2025-06-25 14:32:18 +08:00
guanhuan
d046fd5298 移除销售订单供货方式确认 2025-06-25 14:22:27 +08:00
hyyy
4b026535f8 修改固定列tree的传参方式 2025-06-25 14:01:34 +08:00
yuxianghui
28ade4ac72 完成 物料需求计划主数据准备：库存路线 需求 2025-06-25 13:57:56 +08:00
guanhuan
9f00fddc09 物料需求计划管理 2025-06-25 09:57:19 +08:00
hyyy
99ac89f995 需求-字段命名调整 2025-06-25 09:54:37 +08:00
胡尧
372f95d812 Accept Merge Request #2256: (feature/6711 -> develop) 
Merge Request: 待完工工单明细，控制时间为大于48小时，小于当前时间

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2256?initial=true
 2025-06-25 09:43:11 +08:00
胡尧
f165bec662 待完工工单明细，控制时间为大于48小时，小于当前时间 2025-06-25 09:42:53 +08:00
胡尧
4099756d15 Accept Merge Request #2255: (feature/6711 -> develop) 
Merge Request: 日计划量对工单id去重

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2255?initial=true
 2025-06-25 08:44:32 +08:00
胡尧
133eac4a5c 日计划量对工单id去重 2025-06-25 08:43:59 +08:00
guanhuan
f41d3558d2 物料需求计划管理 2025-06-24 17:46:55 +08:00
禹翔辉
91bad533c3 Accept Merge Request #2254: (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/2254
 2025-06-24 17:10:41 +08:00
yuxianghui
f5ed94866b 调拨单需验证质检单数量方法优化 2025-06-24 16:59:38 +08:00
胡尧
b70f280c6e Accept Merge Request #2253: (feature/6711 -> develop) 
Merge Request: 修复明细接口bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2253?initial=true
 2025-06-24 15:56:52 +08:00
胡尧
9922402b3b 修复明细接口bug 2025-06-24 15:56:33 +08:00
胡尧
152657e41b Accept Merge Request #2252: (feature/6711 -> develop) 
Merge Request: 修改未完成订单明细的判断逻辑

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2252?initial=true
 2025-06-24 15:51:17 +08:00
胡尧
0a79a4e336 修改未完成订单明细的判断逻辑 2025-06-24 15:50:45 +08:00
yuxianghui
35b1d648c3 产品新增单件用量 unit_number 字段，值由bfm下单同步获得；产品生成的BOM中组件数量的值由unit_number 字段提供。 2025-06-24 15:36:23 +08:00
胡尧
174af13a58 Accept Merge Request #2251: (feature/6711 -> develop) 
Merge Request: 修改工单状态对应名字

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2251?initial=true
 2025-06-24 15:35:42 +08:00
胡尧
00922e3674 修改工单状态对应名字 2025-06-24 15:35:19 +08:00
胡尧
832b06be1f Merge branch 'develop' into feature/根据项目组区分sf代码 2025-06-24 15:06:31 +08:00
胡尧
3b60db56de Accept Merge Request #2250: (feature/6711 -> develop) 
Merge Request: 修改大屏获取订单详情接口

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2250
 2025-06-24 14:52:47 +08:00
胡尧
2a330a4bd8 修改大屏获取订单详情接口 2025-06-24 14:52:03 +08:00
yuxianghui
579b7138e7 需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发 2025-06-24 14:41:49 +08:00
yuxianghui
98f8430c45 Revert "需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发" 
This reverts commit 912847ae33.
 2025-06-24 14:32:40 +08:00
yuxianghui
912847ae33 需求 调拨单关联校验是否完成质量检查时，可先排除欠单量后再校验 开发 2025-06-24 14:32:21 +08:00
胡尧
33647fa3e0 修改明细接口 2025-06-24 14:18:27 +08:00
管欢
d1f9f8cf8c Accept Merge Request #2249: (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/2249
 2025-06-24 11:44:41 +08:00
guanhuan
7d1f7b11eb 坯料尺寸显示修改 2025-06-24 11:39:47 +08:00
guanhuan
fe3492ceb5 坯料尺寸显示修改 2025-06-24 11:32:41 +08:00
guanhuan
02b4f76326 物料需求计划 2025-06-24 11:17:41 +08:00
胡尧
72f737c370 Accept Merge Request #2248: (feature/6711 -> develop) 
Merge Request: 解决大屏bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2248?initial=true
 2025-06-23 17:54:56 +08:00
胡尧
a2a652eea4 解决大屏bug 2025-06-23 17:54:38 +08:00
guanhuan
2f26aee90a 物料需求计划 2025-06-23 17:21:50 +08:00
管欢
98c5b3b013 Accept Merge Request #2247: (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/2247
 2025-06-23 14:26:02 +08:00