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

5756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
9f3791bd6b Accept Merge Request #1940: (feature/制造功能优化 -> develop) 
Merge Request: sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1940?initial=true
 2025-03-20 16:21:05 +08:00
mgw
ae1028972c sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中 2025-03-20 16:19:55 +08:00
马广威
b86d15c5cb Accept Merge Request #1939: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1939?initial=true
 2025-03-20 15:43:17 +08:00
mgw
52e68ffa4c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-20 15:41:49 +08:00
mgw
f85f614190 质检标准类型是出厂检验报告时可以更换控制方式-需要增加校验 2025-03-20 15:41:10 +08:00
禹翔辉
2da22d5f19 Accept Merge Request #1938: (feature/销售_采购申请优化 -> develop) 
Merge Request: 1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1938
 2025-03-20 15:37:55 +08:00
mgw
98644a4b57 调整加工订单匹配条件 2025-03-20 15:34:17 +08:00
yuxianghui
6c879e4af3 1、新增由销售单生成的采购申请自动确认；2、销售单新增【采购申请】跳转按钮 2025-03-20 15:20:05 +08:00
马广威
134c68abc8 Accept Merge Request #1937: (feature/制造功能优化 -> develop) 
Merge Request: 取消发布增加二次确认；发布状态隐藏

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1937?initial=true
 2025-03-20 08:48:23 +08:00
mgw
d6a7a3c919 取消发布增加二次确认；发布状态隐藏 2025-03-20 08:45:40 +08:00
马广威
db661e76f5 Accept Merge Request #1935: (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/1935
 2025-03-19 15:43:09 +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
廖丹龙
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
221e25f581 【合金牌号】，【材料应用】字段同步 2025-03-19 15:33:06 +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
马广威
a75e236f1f Accept Merge Request #1934: (feature/制造功能优化 -> develop) 
Merge Request: 当调拨单完成后，重新发布才重新写入到加工订单明细

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1934?initial=true
 2025-03-19 13:17:50 +08:00
mgw
e1177a44e8 当调拨单完成后，重新发布才重新写入到加工订单明细 2025-03-19 13:17:15 +08:00
马广威
27702fe46e Accept Merge Request #1933: (feature/制造功能优化 -> develop) 
Merge Request: 调整检验数边界值

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1933?initial=true
 2025-03-19 13:06:02 +08:00
mgw
8c793c6ad9 调整检验数边界值 2025-03-19 13:04:19 +08:00
liaodanlong
0b067f9999 原材料的调拨单缺少零件图号零件名称 2025-03-19 12:59:16 +08:00
马广威
625188d46d Accept Merge Request #1932: (feature/制造功能优化 -> develop) 
Merge Request: 修改取消明细状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1932?initial=true
 2025-03-19 12:54:18 +08:00
mgw
6178ad0f8e 修改取消明细状态 2025-03-19 12:53:40 +08:00
马广威
6c89a2c4fb Accept Merge Request #1931: (feature/制造功能优化 -> develop) 
Merge Request: 调整名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1931?initial=true
 2025-03-19 11:34:38 +08:00
mgw
dc5e70c118 调整名称 2025-03-19 11:33:59 +08:00
马广威
03d6f9a32e Accept Merge Request #1930: (feature/制造功能优化 -> develop) 
Merge Request: 调整字段名

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1930?initial=true
 2025-03-19 11:22:21 +08:00
mgw
8634c1fc40 调整字段名 2025-03-19 11:21:28 +08:00
马广威
e1c535f907 Accept Merge Request #1929: (feature/制造功能优化 -> develop) 
Merge Request: 增加包名映射

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1929
 2025-03-19 11:17:38 +08:00
mgw
a556c21196 增加包名映射 2025-03-19 11:16:36 +08:00
马广威
b1821d3ed6 Accept Merge Request #1928: (feature/制造功能优化 -> develop) 
Merge Request: state字段添加ondelete策略

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1928?initial=true
 2025-03-19 11:08:34 +08:00
mgw
a8d8bcbcee state字段添加ondelete策略 2025-03-19 11:07:49 +08:00
马广威
e7d8587a32 Accept Merge Request #1927: (feature/制造功能优化 -> develop) 
Merge Request: 取消列表增加采购申请明细

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1927?initial=true
 2025-03-19 11:01:51 +08:00
mgw
b53ea2e0e9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-19 11:01:21 +08:00
mgw
5b979ffc34 取消列表增加采购申请明细 2025-03-19 11:00:48 +08:00
马广威
e5fc3dfe62 Accept Merge Request #1926: (feature/制造功能优化 -> develop) 
Merge Request: 判断文件是否上传

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1926?initial=true
 2025-03-19 10:23:38 +08:00
mgw
08cd1a176b 判断文件是否上传 2025-03-19 10:22:44 +08:00
马广威
bab21d7b76 Accept Merge Request #1925: (feature/制造功能优化 -> develop) 
Merge Request: 出厂检验报告bug修改

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1925?initial=true
 2025-03-19 10:05:59 +08:00
mgw
6bdaad8718 出厂检验报告上传模板后-没有自动新增有数值的列 2025-03-19 10:03:59 +08:00
mgw
94441422cd 出厂检验报告已经发布-还可以编辑页面内容-发布后要禁掉编辑功能 2025-03-19 09:43:23 +08:00
mgw
5f48dad86c 发料出库单质检弹窗发布前校验 2025-03-19 08:44:23 +08:00
马广威
f5bf727b34 Accept Merge Request #1924: (feature/制造功能优化 -> develop) 
Merge Request: 修正问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1924?initial=true
 2025-03-18 16:50:35 +08:00
mgw
c55231555c 修正问题 2025-03-18 16:49:50 +08:00
马广威
e4606ece75 Accept Merge Request #1923: (feature/制造功能优化 -> develop) 
Merge Request: 修正数据类型转换

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1923
 2025-03-18 16:42:14 +08:00
mgw
972c06cdc1 修正数据类型转换 2025-03-18 16:41:35 +08:00
马广威
f8bfb7ba40 Accept Merge Request #1922: (feature/制造功能优化 -> develop) 
Merge Request: 调整报告逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1922
 2025-03-18 16:29:24 +08:00
mgw
b2c3694a23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-18 16:28:33 +08:00
mgw
be0df6e66b 调整报告逻辑 2025-03-18 16:26:39 +08:00
mgw
242f9c9050 总数量问题 2025-03-18 15:58:05 +08:00
廖丹龙
307bfa19f2 Accept Merge Request #1921: (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/1921
 2025-03-18 15:55:27 +08:00