jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,830 Commits 134 Branches 0 Tags
40dcd11da85ad088b47eaa2ad9f9263cb4ee22eb
Commit Graph

1472 Commits

Author SHA1 Message Date
胡尧
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
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
yuxianghui
d202e7ee93 零件名称字段计算方法修改 2025-03-21 15:37:10 +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
廖丹龙
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
5b979ffc34 取消列表增加采购申请明细 2025-03-19 11:00:48 +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
廖丹龙
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
管欢
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
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
yuxianghui
7ddcfc6226 1、处理 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 ；2、处理 工单Rfid绑定解绑是数据不正确问题 2025-03-13 14:39:04 +08:00
liaodanlong
3543531f61 表面工艺添加零件图号零件名称 2025-03-13 14:13:28 +08:00
yuxianghui
e10483b87b Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化 2025-03-13 11:12:06 +08:00
yuxianghui
83699fcae6 1、修改质检提示翻译；2、处理单据合并原单据数据不全问题；3、处理制造订单返工报错 2025-03-13 11:11:22 +08:00
廖丹龙
b2b8762138 Accept Merge Request #1898: (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/1898
 2025-03-13 10:12:56 +08:00
liaodanlong
7c48e6b186 同一个销售订单的不同产品的坯料获取方式不一样，生成的采购订单问题 2025-03-13 09:49:17 +08:00
yuxianghui
0d8445e444 处理工单的Rfid扫码绑定解绑问题 2025-03-13 08:36:10 +08:00
liaodanlong
5b084624df 不送检的质量检查单状态更新：等待、待处理 2025-03-12 13:46:07 +08:00
yuxianghui
826d5b1d58 1、优化工单子页签可全量配置处理方法； 2025-03-06 13:37:52 +08:00
yuxianghui
7d4314abc7 完成 工单子页签可全量配置 2025-03-05 11:24:48 +08:00
mgw
7e93586f69 人工建立销售单取第一份bom 2025-03-04 11:40:39 +08:00
廖丹龙
ec1da84da0 Accept Merge Request #1888: (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/1888
 2025-02-28 16:38:23 +08:00
liaodanlong
4c8cf5caf8 制造订单状态为返工时限制表面工艺工单状态 2025-02-28 16:36:16 +08:00
马广威
aa1517ebce Accept Merge Request #1887: (release/release_2.9 -> develop) 
Merge Request: 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1887?initial=true
 2025-02-28 16:06:04 +08:00
mgw
c24f539197 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误 2025-02-28 16:04:49 +08:00
yuxianghui
76f9b5ef3e 处理特殊表面工艺外协入库单点击【验证】报错 2025-02-28 08:36:12 +08:00
廖丹龙
8fd536324e Accept Merge Request #1884: (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/1884
 2025-02-27 15:11:21 +08:00
liaodanlong
3bcc673d88 人工线下加工表面工艺逻辑还原 2025-02-27 15:09:14 +08:00
廖丹龙
a8f70c82d1 Accept Merge Request #1879: (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/1879
 2025-02-27 13:55:33 +08:00
liaodanlong
20932f9d51 人工线下加工表面工艺逻辑修改 2025-02-27 13:46:30 +08:00
yuxianghui
919717ccc5 处理工单外协创建的外协出入库单没有质检单的问题 2025-02-27 13:13:22 +08:00
mgw
82cbd95b7d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 14:47:45 +08:00
mgw
a4bfda0a41 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 14:47:28 +08:00
廖丹龙
6e0e00a5a1 Accept Merge Request #1867: (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/1867
 2025-02-26 14:38:34 +08:00
liaodanlong
0cb73b6d29 切割工单过滤掉回退按钮 2025-02-26 14:36:50 +08:00
廖丹龙
358ad68dc9 Accept Merge Request #1866: (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/1866
 2025-02-26 14:17:33 +08:00