Commit Graph

295 Commits

Author SHA1 Message Date
yuxianghui
a68d6d4d06 处理 采购订单确认时,一补货组的补货单没有合并问题 2025-06-26 16:55:38 +08:00
胡尧
4bea169327 撤回_run_manufacturing方法 2025-06-26 10:26:39 +08:00
胡尧
a5bb686708 Accept Merge Request #2245: (feature/根据项目组区分sf代码 -> develop)
Merge Request: 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2245?initial=true
2025-06-23 10:54:27 +08:00
yuxianghui
71a0f39ec9 新增如果采购订单类型为委外加工,则不进行供应商校验直接生成补给单 2025-06-18 10:50:13 +08:00
胡尧
92f591c3e7 将sf_manufacturing模块中stock.py的_run_manufacture方法进行拆分 2025-06-18 09:25:44 +08:00
胡尧
af1bc021d6 在调拨单验证前,先进行设置数量 2025-06-16 14:24:50 +08:00
胡尧
1811dbf0fd 解决修改产品名称带来的影响 2025-06-16 09:33:52 +08:00
管欢
1856a1a4ef Accept Merge Request #2134: (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/2134
2025-05-19 11:04:44 +08:00
guanhuan
52579673de 采购申请单完成操作优化 2025-05-19 08:54:02 +08:00
胡尧
4b443e65f6 解决库存单据零件图号零件名称不对的问题 2025-05-16 09:14:37 +08:00
胡尧
c80e12d731 回退工艺外协代码 2025-05-15 11:07:22 +08:00
胡尧
9c4d545915 Merge branch 'develop' into feature/6694 2025-05-15 10:33:42 +08:00
胡尧
61bcd72a41 表面工艺外协调拨单数量问题 2025-05-09 17:24:24 +08:00
liaodanlong
b5339046b9 工艺外协代码 2025-05-08 16:42:18 +08:00
胡尧
fffbfc21c2 表面工艺外协工单流程数量按照制造订单的product_uom_qty设置 2025-05-07 13:02:13 +08:00
guanhuan
66c745af3c 排序优化 2025-04-18 13:22:25 +08:00
guanhuan
9cfc8418ec 优化库存排序 2025-04-17 13:44:25 +08:00
胡尧
d7597359ba 处理多个表面工艺,确认供货路线报错的问题 2025-03-31 16:50:50 +08:00
mgw
7ad9885377 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-28 14:05:29 +08:00
胡尧
f34c01d1b0 解决表面工艺外协调拨单验证报错的问题 2025-03-28 13:37:29 +08:00
liaodanlong
878fef18df 产品加工面部代码还原 2025-03-28 10:03:41 +08:00
liaodanlong
d2155b17b4 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
#	sf_manufacturing/models/product_template.py
2025-03-26 17:01:13 +08:00
guanhuan
236158d556 调拨单零件图号信息搜索 2025-03-26 13:35:28 +08:00
liaodanlong
6ad945b720 产品加工面板空值处理 2025-03-25 10:39:02 +08:00
liaodanlong
60539462a0 报错处理 2025-03-25 10:02:39 +08:00
liaodanlong
81b425ae0c 调拨单零件图号零件名称处理 2025-03-24 17:28:16 +08:00
liaodanlong
89a2260adc 日志修改 2025-03-24 15:16:55 +08:00
liaodanlong
e6d54a3eba 调拨单零件图号零件名称计算逻辑 错误处理 2025-03-24 14:53:33 +08:00
liaodanlong
a0606842e5 过滤错误 2025-03-24 14:26:53 +08:00
liaodanlong
d014ba980b 过滤错误 2025-03-24 14:25:19 +08:00
liaodanlong
cf060d0d6c 自加工坯料制造订单的调拨单零件图号零件名称赋值 2025-03-20 10:24:34 +08:00
liaodanlong
0b067f9999 原材料的调拨单缺少零件图号零件名称 2025-03-19 12:59:16 +08:00
yuxianghui
83699fcae6 1、修改质检提示翻译;2、处理单据合并原单据数据不全问题;3、处理制造订单返工报错 2025-03-13 11:11:22 +08:00
yuxianghui
76f9b5ef3e 处理特殊表面工艺外协入库单点击【验证】报错 2025-02-28 08:36:12 +08:00
yuxianghui
919717ccc5 处理工单外协创建的外协出入库单没有质检单的问题 2025-02-27 13:13:22 +08:00
廖丹龙
4beaeffd46 Accept Merge Request #1862: (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/1862
2025-02-26 11:32:02 +08:00
liaodanlong
2e47922086 匹配规则修改 2025-02-26 11:25:09 +08:00
廖丹龙
fd76863daa Accept Merge Request #1861: (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/1861
2025-02-26 10:48:29 +08:00
liaodanlong
85c8e834cb 匹配规则修改 2025-02-26 10:46:02 +08:00
廖丹龙
fa2f5552e2 Accept Merge Request #1849: (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/1849
2025-02-25 16:40:12 +08:00
liaodanlong
2e648dea4e 成品入库单已经完成-工单还有【回退】按钮-还能回退成功 问题处理 2025-02-25 16:29:58 +08:00
yuxianghui
0fd33831f1 处理由客供料入库单生成的质检单没有批次序列号问题 2025-02-25 11:22:41 +08:00
yuxianghui
7ecb28382a 1、库存序列号的更新序列号功能按钮优化;2、销售单默认显示字段优化; 2025-02-25 10:28:51 +08:00
yuxianghui
8c14ea4a85 Merge branch 'feature/库存功能优化' into feature/库存优化_3 2025-02-24 16:27:49 +08:00
yuxianghui
eb11e71d0d 1、入库单据优化:单据就绪自动分配序列号;分配序列号时,流水号取值=MAX(产品序列号模型最大序号,预分配最大序号),界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化 2025-02-24 16:27:09 +08:00
liaodanlong
09ba001b06 sf-生产环境-客供料入库单-合并后的客供料入库单的零件图号显示名称不正确 2025-02-24 13:38:02 +08:00
yuxianghui
fc4eae0488 完成 入库优化:自动确认序列号 需求 2025-02-17 12:42:07 +08:00
mgw
ffde591b3c 人工线下加工默认加工面ZM 2025-02-10 09:12:58 +08:00
mgw
aff81f0b3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-08 13:32:59 +08:00
胡尧
d852cf54df 修复bug 2025-02-07 10:49:17 +08:00