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

2081 Commits

Author SHA1 Message Date
胡尧
fffbfc21c2 表面工艺外协工单流程数量按照制造订单的product_uom_qty设置 2025-05-07 13:02:13 +08:00
胡尧
5aa848de53 修改判断坯料序列号的逻辑 2025-05-07 11:01:01 +08:00
胡尧
2bf43ae9a1 将成品的追溯复制到product上，将坯料的追溯同成品的追组 2025-05-07 08:47:33 +08:00
liaodanlong
ce79016bef 返工未申请重新编程，新工单复制程序文件问题处理 2025-04-27 17:20:15 +08:00
liaodanlong
5f79d2038c 工艺外协采购单展示问题 2025-04-27 11:49:56 +08:00
liaodanlong
defd779279 返工 不重新编程 cnc加工工单没有数据问题 2025-04-27 11:35:29 +08:00
liaodanlong
e2e820267e 字符串拼接问题处理 2025-04-27 11:04:09 +08:00
liaodanlong
94f179a6d6 工艺外协代码回退 2025-04-27 10:46:48 +08:00
liaodanlong
9f1beb4013 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/purchase_order.py
#	sf_sale/models/sale_order.py
 2025-04-27 08:50:45 +08:00
liaodanlong
9cf70cc54c 工艺外协代码回退 2025-04-26 14:42:38 +08:00
liaodanlong
443a21a0cc 工序外协需求 2025-04-25 11:46:05 +08:00
胡尧
8116e4f97d 解决更新出现字段未找到的问题 2025-04-25 10:08:03 +08:00
胡尧
27b9a4f982 解决冲突 2025-04-25 09:19:00 +08:00
胡尧
94007bae2b 产品详情增加只有成品类型才显示模型ID 2025-04-25 09:16:40 +08:00
yuxianghui
d7d094c84d Merge branch 'feature/工单排序' into feature/工单排序_1 2025-04-24 15:05:57 +08:00
yuxianghui
a06e24583d 添加工单先按工序排序，再按创建时间排序 2025-04-24 15:04:04 +08:00
胡尧
4b29def105 修改模型id为模型ID，增加机台判断 2025-04-24 14:58:50 +08:00
胡尧
40137ba69c 去掉产品form重复的字段 2025-04-24 14:31:22 +08:00
胡尧
d16d47dfbe 销售订单，制造订单视图中加入模型id 2025-04-24 14:13:10 +08:00
胡尧
5a61b3b459 调整机台二维码使用A4打印机 2025-04-24 09:58:27 +08:00
胡尧
f598b6c71c 解决从制造订单跳转到产品无法显示模型id的问题 2025-04-23 16:58:59 +08:00
胡尧
7b77d846c3 Accept Merge Request #2040: (hotfix/解决采购申请bug -> develop) 
Merge Request: 解决创建采购申请报错

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2040?initial=true
 2025-04-23 14:21:27 +08:00
廖丹龙
5e3bce1931 Accept Merge Request #2038: (feature/tool_standard_library_process -> 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/2038
 2025-04-23 11:25:04 +08:00
yuxianghui
7c7876e96f 工单添加默认按工序排序 2025-04-23 11:19:08 +08:00
liaodanlong
5438ff6df1 排程产能限制问题 2025-04-23 11:06:03 +08:00
管欢
9b3fe5c070 Accept Merge Request #2036: (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/2036
 2025-04-23 09:48:26 +08:00
廖丹龙
a84f8636a4 Accept Merge Request #2035: (feature/tool_standard_library_process -> 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/2035
 2025-04-23 09:12:59 +08:00
liaodanlong
7c26045377 工艺确认报错问题处理 2025-04-23 09:12:20 +08:00
guanhuan
151bc5da4f 报价菜单修改 2025-04-22 15:43:14 +08:00
廖丹龙
8e09e9715c Accept Merge Request #2031: (feature/tool_standard_library_process -> 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/2031
 2025-04-22 15:05:42 +08:00
liaodanlong
7ecdc31db4 空值处理 2025-04-22 15:00:54 +08:00
廖丹龙
4234a6bbd9 Accept Merge Request #2030: (feature/tool_standard_library_process -> 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/2030
 2025-04-22 14:28:29 +08:00
liaodanlong
8fcc436ce5 设置字段必填 2025-04-22 14:24:10 +08:00
liaodanlong
53a676bc93 查询条件修改 2025-04-22 14:22:31 +08:00
廖丹龙
c6f625fe44 Accept Merge Request #2027: (feature/tool_standard_library_process -> 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/2027
 2025-04-22 13:49:59 +08:00
liaodanlong
397c35867b 产品设置默认供应商数据 2025-04-22 13:41:22 +08:00
liaodanlong
f843610872 采购申请处理 2025-04-22 13:40:15 +08:00
liaodanlong
41e4d2656a 采购申请单 2025-04-22 13:39:57 +08:00
liaodanlong
4272d2855f 坯料自动勾选工艺路线 2025-04-22 13:38:50 +08:00
liaodanlong
cbc73ee8e3 工艺相关展示调整 2025-04-21 16:04:36 +08:00
廖丹龙
73dce5e75e Accept Merge Request #2025: (feature/tool_standard_library_process -> 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/2025
 2025-04-21 15:00:30 +08:00
liaodanlong
9b009ec5a3 外协工单采购申请查询问题 2025-04-21 14:55:52 +08:00
liaodanlong
7d70184a5d 外协工单采购申请查询问题 2025-04-21 14:55:20 +08:00
liaodanlong
9f9c08b1f0 制造订单采购申请查询问题 2025-04-21 14:35:57 +08:00
廖丹龙
5886b4e132 Accept Merge Request #2024: (feature/tool_standard_library_process -> 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/2024
 2025-04-21 13:18:49 +08:00
liaodanlong
77478fd173 制造订单报错问题 2025-04-21 13:16:15 +08:00
胡尧
7849ce6342 工单列表增加模型ID搜索 2025-04-21 11:25:37 +08:00
胡尧
acd8d9c758 Accept Merge Request #2019: (feature/6694 -> develop) 
Merge Request: 去掉多余的代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2019?initial=true
 2025-04-21 09:23:48 +08:00
廖丹龙
d33a801f89 Accept Merge Request #2018: (feature/tool_standard_library_process -> 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/2018
 2025-04-21 09:20:29 +08:00
liaodanlong
a74c07f0bb 字段名写错 2025-04-21 09:19:36 +08:00