胡尧
|
c5ad94c5f3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 14:56:16 +08:00 |
|
liaodanlong
|
e6d54a3eba
|
调拨单零件图号零件名称计算逻辑 错误处理
|
2025-03-24 14:53:33 +08:00 |
|
胡尧
|
43c6686240
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 14:29:47 +08:00 |
|
liaodanlong
|
a0606842e5
|
过滤错误
|
2025-03-24 14:26:53 +08:00 |
|
liaodanlong
|
d014ba980b
|
过滤错误
|
2025-03-24 14:25:19 +08:00 |
|
胡尧
|
5ffbe4c6fc
|
Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 09:00:22 +08:00 |
|
胡尧
|
5ae167c133
|
去掉取消自动加工原因
|
2025-03-24 09:00:16 +08:00 |
|
mgw
|
e861897527
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 18:18:29 +08:00 |
|
mgw
|
4c995d00d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-21 18:16:18 +08:00 |
|
mgw
|
30b01b6e2c
|
增加已批准为无异动
|
2025-03-21 18:15:37 +08:00 |
|
胡尧
|
3bb909c2ee
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:39:56 +08:00 |
|
yuxianghui
|
d202e7ee93
|
零件名称字段计算方法修改
|
2025-03-21 15:37:10 +08:00 |
|
胡尧
|
da19b86bf5
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:29:49 +08:00 |
|
胡尧
|
e1fd4c465e
|
销售订单自动确认
|
2025-03-21 15:27:11 +08:00 |
|
mgw
|
311b95bca5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 13:18:22 +08:00 |
|
廖丹龙
|
384761514b
|
Accept Merge Request #1943: (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/1943
|
2025-03-21 11:34:57 +08:00 |
|
mgw
|
94d0c14e1f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-20 16:23:01 +08:00 |
|
mgw
|
ae1028972c
|
sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中
|
2025-03-20 16:19:55 +08:00 |
|
liaodanlong
|
cf060d0d6c
|
自加工坯料制造订单的调拨单零件图号零件名称赋值
|
2025-03-20 10:24:34 +08:00 |
|
mgw
|
b89cfb899b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 15:44:21 +08:00 |
|
mgw
|
bf8ff7199e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-19 15:42:20 +08:00 |
|
胡尧
|
0ff0cc5fbd
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-19 15:41:51 +08:00 |
|
廖丹龙
|
813939a6c2
|
Accept Merge Request #1936: (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/1936
|
2025-03-19 15:41:02 +08:00 |
|
mgw
|
e4ed431167
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-19 15:32:07 +08:00 |
|
mgw
|
1a511b93cf
|
调整名称及总数量逻辑
|
2025-03-19 15:31:34 +08:00 |
|
hyyy
|
9093770ce1
|
修改取消列表，修改出厂检验报告
|
2025-03-19 14:45:04 +08:00 |
|
liaodanlong
|
0b067f9999
|
原材料的调拨单缺少零件图号零件名称
|
2025-03-19 12:59:16 +08:00 |
|
mgw
|
5b51cc3de4
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 12:55:23 +08:00 |
|
mgw
|
6178ad0f8e
|
修改取消明细状态
|
2025-03-19 12:53:40 +08:00 |
|
mgw
|
9e939467e5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:35:27 +08:00 |
|
mgw
|
dc5e70c118
|
调整名称
|
2025-03-19 11:33:59 +08:00 |
|
mgw
|
b05492615f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:23:49 +08:00 |
|
mgw
|
8634c1fc40
|
调整字段名
|
2025-03-19 11:21:28 +08:00 |
|
mgw
|
32ed0e9693
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:18:28 +08:00 |
|
mgw
|
a556c21196
|
增加包名映射
|
2025-03-19 11:16:36 +08:00 |
|
mgw
|
da06688571
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:02:40 +08:00 |
|
mgw
|
5b979ffc34
|
取消列表增加采购申请明细
|
2025-03-19 11:00:48 +08:00 |
|
胡尧
|
f6e87493d3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 11:28:23 +08:00 |
|
廖丹龙
|
8c4c65a00f
|
Accept Merge Request #1919: (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/1919
|
2025-03-18 11:27:43 +08:00 |
|
liaodanlong
|
3642398724
|
表面工艺零件图号没有问题
|
2025-03-18 11:25:46 +08:00 |
|
mgw
|
4618c83b2f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 09:45:00 +08:00 |
|
mgw
|
a2868a2581
|
修复按钮规则；修复排程单取消
|
2025-03-18 09:43:48 +08:00 |
|
mgw
|
e89400f04e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 09:18:47 +08:00 |
|
廖丹龙
|
fb19a19b25
|
Accept Merge Request #1912: (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/1912
|
2025-03-17 16:50:52 +08:00 |
|
liaodanlong
|
8347a8b029
|
零件图号零件名称无数据 问题修复
|
2025-03-17 16:05:42 +08:00 |
|
胡尧
|
051f8128e9
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-17 15:05:47 +08:00 |
|
mgw
|
221eb7c3a1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
# Conflicts:
# quality_control/security/ir.model.access.csv
# quality_control/wizard/quality_check_wizard.py
# sf_quality/__manifest__.py
# sf_quality/models/__init__.py
# sf_quality/models/stock.py
|
2025-03-17 13:46:40 +08:00 |
|
liaodanlong
|
0a1b48ed93
|
零件图号零件名称数据填充
|
2025-03-17 11:26:42 +08:00 |
|
胡尧
|
8f61f258b1
|
解决冲突
|
2025-03-14 16:08:37 +08:00 |
|
胡尧
|
a864845d2b
|
解决销售订单form中，tree内显示模型的问题
|
2025-03-14 16:06:33 +08:00 |
|