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

5571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
liaodanlong
cd115ea411 过滤掉检测结果为合格的数据 2025-02-26 14:15:46 +08:00
廖丹龙
64fa908519 Accept Merge Request #1865: (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/1865
 2025-02-26 13:33:40 +08:00
liaodanlong
266c448c00 字段名称修改 2025-02-26 13:21:27 +08:00
马广威
1fb39e55c7 Accept Merge Request #1864: (feature/制造功能优化 -> develop) 
Merge Request: 去除对切割工单的编程控制

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1864?initial=true
 2025-02-26 13:09:45 +08:00
mgw
dbaf5342fc 去除对切割工单的编程控制 2025-02-26 13:09:15 +08:00
马广威
8bfb5b3b79 Accept Merge Request #1863: (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/1863?initial=true
 2025-02-26 12:43:21 +08:00
mgw
897a10a500 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 12:42:58 +08:00
mgw
2035dd6857 切割工单隐藏编程相关 2025-02-26 12:42:42 +08:00
廖丹龙
4beaeffd46 Accept Merge Request #1862: (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/1862
 2025-02-26 11:32:02 +08:00
liaodanlong
cd78a39410 匹配规则修改 2025-02-26 11:30:14 +08:00
liaodanlong
2e47922086 匹配规则修改 2025-02-26 11:25:09 +08:00
廖丹龙
fd76863daa Accept Merge Request #1861: (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/1861
 2025-02-26 10:48:29 +08:00
liaodanlong
85c8e834cb 匹配规则修改 2025-02-26 10:46:02 +08:00
马广威
e4c729e8e0 Accept Merge Request #1860: (feature/制造功能优化 -> develop) 
Merge Request: 调整判断逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1860?initial=true
 2025-02-26 10:41:42 +08:00
mgw
e9226a87f5 调整判断逻辑 2025-02-26 10:41:05 +08:00
廖丹龙
22b0b02168 Accept Merge Request #1859: (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/1859
 2025-02-26 10:31:10 +08:00
liaodanlong
bff10de6b2 修改计算方法名称 2025-02-26 10:29:01 +08:00
廖丹龙
ebe8d56ffd Accept Merge Request #1854: (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/1854
 2025-02-26 10:22:03 +08:00
liaodanlong
d7e3ce2b1a 刀具标准库数据同步 2025-02-26 10:21:40 +08:00
马广威
ae7e902b4d Accept Merge Request #1858: (feature/制造功能优化 -> develop) 
Merge Request: 修改变量名

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1858?initial=true
 2025-02-26 10:13:57 +08:00
mgw
0be9afcdfe 修改变量名 2025-02-26 10:13:26 +08:00
马广威
02582470e5 Accept Merge Request #1857: (feature/制造功能优化 -> develop) 
Merge Request: 调整判断逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1857?initial=true
 2025-02-26 10:06:55 +08:00
mgw
e3b2dade15 调整判断逻辑 2025-02-26 10:06:27 +08:00
马广威
f6e36014c8 Accept Merge Request #1856: (feature/制造功能优化 -> develop) 
Merge Request: 修改状态名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1856?initial=true
 2025-02-26 09:58:39 +08:00
mgw
f89b52bad1 修改状态名称 2025-02-26 09:58:16 +08:00
马广威
157ce5e2dc Accept Merge Request #1855: (feature/制造功能优化 -> develop) 
Merge Request: sf-工厂取消接单-取消列表展示数据问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1855?initial=true
 2025-02-26 09:54:53 +08:00
mgw
478c54a44d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 09:54:24 +08:00
mgw
f06951958d sf-工厂取消接单-取消列表展示数据问题 2025-02-26 09:54:08 +08:00
liaodanlong
8799fcddb2 还原代码 2025-02-26 09:41:17 +08:00
马广威
0d25eb5009 Accept Merge Request #1853: (feature/制造功能优化 -> develop) 
Merge Request: sf-工厂取消接单-坯料的制造订单未取消

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1853?initial=true
 2025-02-26 09:41:07 +08:00
mgw
92c3de98ba Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 09:40:39 +08:00
mgw
dca6f9fb53 sf-工厂取消接单-坯料的制造订单未取消 2025-02-26 09:40:18 +08:00
liaodanlong
c4c6386871 坯料的采购订单零件图号，零件名称显示 2025-02-26 09:37:56 +08:00
禹翔辉
4bdeec6e24 Accept Merge Request #1852: (feature/调拨质检消息优化_1 -> develop) 
Merge Request: Merge branch 'feature/调拨质检消息优化' into feature/调拨质检消息优化_1

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1852
 2025-02-26 09:25:26 +08:00
yuxianghui
b7331a811b Merge branch 'feature/调拨质检消息优化' into feature/调拨质检消息优化_1 2025-02-26 09:23:44 +08:00
yuxianghui
e5d1a18640 处理质检完成时消息通知重复问题 2025-02-26 09:22:50 +08:00
马广威
62e8634abf Accept Merge Request #1851: (feature/制造功能优化 -> develop) 
Merge Request: 坯料自加工的切割工序状态也判断了编程状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1851
 2025-02-26 09:11:10 +08:00
mgw
2a8791b9a9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 09:10:04 +08:00
mgw
def9bd2c6e 坯料自加工的切割工序状态也判断了编程状态 2025-02-26 09:09:26 +08:00
胡尧
bf785328ac Accept Merge Request #1850: (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/1850?initial=true
 2025-02-25 17:25:26 +08:00
胡尧
332dbce769 工单返工完成不触发制造订单的完成事件 2025-02-25 17:25:04 +08:00
廖丹龙
fa2f5552e2 Accept Merge Request #1849: (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/1849
 2025-02-25 16:40:12 +08:00
liaodanlong
c400553294 工艺确认时的工单空值处理 2025-02-25 16:35:40 +08:00
liaodanlong
7975fd2bd2 CNC回退后需开放送检按钮 2025-02-25 16:32:04 +08:00
liaodanlong
a0c5f9d15f 制造订单是返工状态时-上报返工的工单有【回退】入口-要隐藏问题处理 2025-02-25 16:31:18 +08:00
liaodanlong
2e648dea4e 成品入库单已经完成-工单还有【回退】按钮-还能回退成功 问题处理 2025-02-25 16:29:58 +08:00
黄焱
7056298420 Accept Merge Request #1848: (feature/前端样式修改 -> develop) 
Merge Request: 去掉listRenderer含有hasSelectors时的row_no，因为td中没有序号

Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1848?initial=true
 2025-02-25 16:28:26 +08:00
hyyy
3cd7a52900 去掉listRenderer含有hasSelectors时的row_no，因为td中没有序号 2025-02-25 16:15:11 +08:00