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

5837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
胡尧
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
0702e1dd51 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-21 18:26:58 +08:00
马广威
d9d434d994 Accept Merge Request #1950: (feature/制造功能优化 -> develop) 
Merge Request: 调整报告样式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1950?initial=true
 2025-03-21 18:26:18 +08:00
mgw
08fa26d9c8 调整报告样式 2025-03-21 18:25:20 +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
马广威
4ba3a56794 Accept Merge Request #1949: (feature/制造功能优化 -> develop) 
Merge Request: 增加已批准为无异动

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1949?initial=true
 2025-03-21 18:17:32 +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
禹翔辉
b2b9120577 Accept Merge Request #1948: (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/1948
 2025-03-21 16:14:32 +08:00
yuxianghui
ad8f63570d 请购明细添加供货方式搜索 2025-03-21 16:10:30 +08:00
胡尧
3bb909c2ee Merge branch 'develop' into feature/commercially_launched 2025-03-21 15:39:56 +08:00
禹翔辉
e8b22cedea Accept Merge Request #1947: (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/1947
 2025-03-21 15:39:00 +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
胡尧
2876d56803 Accept Merge Request #1946: (feature/mrp_bug_fixed -> develop) 
Merge Request: 销售订单自动确认

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1946?initial=true
 2025-03-21 15:29:22 +08:00
胡尧
e1fd4c465e 销售订单自动确认 2025-03-21 15:27:11 +08:00
胡尧
dc318769af Merge branch 'develop' into feature/commercially_launched 2025-03-21 15:13:28 +08:00
禹翔辉
31820dfef1 Accept Merge Request #1945: (feature/采购申请字段调整 -> develop) 
Merge Request: Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1945
 2025-03-21 15:07:48 +08:00
yuxianghui
1cb46bb1e1 Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整 2025-03-21 15:06:29 +08:00
yuxianghui
80e9085e29 采购申请字段调整 2025-03-21 15:05:42 +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
马广威
d1f8bdb1f4 Accept Merge Request #1944: (feature/制造功能优化 -> develop) 
Merge Request: 调整原有质检单图纸获取逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1944
 2025-03-21 13:17:11 +08:00
mgw
08267ba1e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-21 13:16:18 +08:00
mgw
c6f1bc80a7 调整原有质检单图纸获取逻辑 2025-03-21 13:15:59 +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
胡尧
80118b61c2 Merge branch 'develop' into feature/commercially_launched 2025-03-21 11:24:02 +08:00
禹翔辉
eab3ba9478 Accept Merge Request #1942: (feature/采购申请代码搬迁 -> develop) 
Merge Request: Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1942
 2025-03-21 11:23:27 +08:00
yuxianghui
c2be45f204 Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁 2025-03-21 11:21:08 +08:00
yuxianghui
86d2fb1ac2 efms-purchase_request模块新增修改代码搬迁到sf-jikimo_purchase_request模块 2025-03-21 11:20:24 +08:00
禹翔辉
f28d07e58f Accept Merge Request #1941: (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/1941
 2025-03-20 17:03:28 +08:00
yuxianghui
7124eebabe 采购单采购类型计算方法添加新判断条件 2025-03-20 17:01:36 +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
马广威
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
mgw
3f6f9bb709 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-20 15:44:11 +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
liaodanlong
cf060d0d6c 自加工坯料制造订单的调拨单零件图号零件名称赋值 2025-03-20 10:24:34 +08:00
mgw
49a1ec353a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-20 08:49:47 +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
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
马广威
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
胡尧
0ff0cc5fbd Merge branch 'develop' into feature/commercially_launched 2025-03-19 15:41:51 +08:00