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

1504 Commits

Author SHA1 Message Date
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
liaodanlong
11a5217430 子制造订单零件图号与零件名称获取方式修改 2025-03-26 16:57:47 +08:00
guanhuan
236158d556 调拨单零件图号信息搜索 2025-03-26 13:35:28 +08:00
胡尧
40dcd11da8 解决供货路线选择报错 2025-03-26 08:42:08 +08:00
胡尧
8ec746858c 询价单行项目价格判断 2025-03-25 16:25:05 +08:00
胡尧
03539c7ed3 询价单行项目价格判断 2025-03-25 16:20:54 +08:00
胡尧
4d38a11c3c 修改询价单判断行项目价格不能为0 2025-03-25 15:58:24 +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
33fabc068a 报错处理 2025-03-24 16:06:11 +08:00
liaodanlong
db4dd33709 报错处理 2025-03-24 15:54:59 +08:00
liaodanlong
4acb0fa0ba Merge branch 'refs/heads/develop' into feature/commercially_launched 2025-03-24 15:39:26 +08:00
liaodanlong
89a2260adc 日志修改 2025-03-24 15:16:55 +08:00
胡尧
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
胡尧
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
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
liaodanlong
cf060d0d6c 自加工坯料制造订单的调拨单零件图号零件名称赋值 2025-03-20 10:24:34 +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
liaodanlong
0b067f9999 原材料的调拨单缺少零件图号零件名称 2025-03-19 12:59:16 +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
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
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
管欢
34565c5d79 Accept Merge Request #1906: (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/1906
 2025-03-14 15:43:18 +08:00
胡尧
a6a2e53111 Merge branch 'develop' into feature/commercially_launched 2025-03-14 13:52:18 +08:00
guanhuan
3baf3e60e8 修复外协入库单根据图号查询不到 2025-03-13 17:21:05 +08:00
廖丹龙
395db2cf5f Accept Merge Request #1904: (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/1904
 2025-03-13 16:21:00 +08:00
liaodanlong
ef5eea1845 删除无用代码 2025-03-13 15:32:54 +08:00
廖丹龙
528d63123f Accept Merge Request #1901: (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/1901
 2025-03-13 15:27:59 +08:00
胡尧
a11329eaf8 Merge branch 'develop' into feature/commercially_launched 2025-03-13 14:51:21 +08:00
yuxianghui
7ddcfc6226 1、处理 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 ；2、处理 工单Rfid绑定解绑是数据不正确问题 2025-03-13 14:39:04 +08:00
liaodanlong
3543531f61 表面工艺添加零件图号零件名称 2025-03-13 14:13:28 +08:00
胡尧
24897f07f8 获取编程单，不传递模型参数 2025-03-13 13:58:13 +08:00
胡尧
a1a94867f0 Merge branch 'develop' into feature/commercially_launched 2025-03-13 11:34:17 +08:00
yuxianghui
e10483b87b Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化 2025-03-13 11:12:06 +08:00