mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +08:00 |
|
mgw
|
44f29d001e
|
调整人工线下加工页面内容
|
2025-02-08 14:08:53 +08:00 |
|
mgw
|
aff81f0b3a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-08 13:32:59 +08:00 |
|
mgw
|
88840abf9f
|
制造订单编程状态搜索的优化需求
|
2025-02-08 13:32:40 +08:00 |
|
胡尧
|
d852cf54df
|
修复bug
|
2025-02-07 10:49:17 +08:00 |
|
mgw
|
978e427734
|
调整制造订单集合
|
2025-02-05 17:44:32 +08:00 |
|
mgw
|
dd35a6ae5f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-05 17:42:10 +08:00 |
|
mgw
|
0a8cc050b8
|
人工线下加工工单也需要走cloud编程流程的优化需求
|
2025-02-05 17:41:52 +08:00 |
|
guanhuan
|
5636681ee6
|
CNC工单返工
|
2025-01-23 16:42:16 +08:00 |
|
guanhuan
|
9b49edb290
|
装夹工单返工
|
2025-01-23 13:55:35 +08:00 |
|
胡尧
|
6abb237491
|
Merge branch 'develop' into feature/验证合并的逻辑
|
2025-01-21 10:39:41 +08:00 |
|
yuxianghui
|
8f9b7b2fb0
|
优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理
|
2025-01-20 15:39:08 +08:00 |
|
mgw
|
32255af3a3
|
申请编程状态
|
2025-01-20 14:53:26 +08:00 |
|
yuxianghui
|
955b6a6213
|
工单优化
|
2025-01-20 14:47:09 +08:00 |
|
yuxianghui
|
8e788d3745
|
处理CNC加工工单通过接口上产线下产线变更为待检测时，对应质检单还是等待状态问题
|
2025-01-20 14:18:02 +08:00 |
|
guanhuan
|
dc843588e9
|
制造列表新增编程状态显示
|
2025-01-20 14:09:23 +08:00 |
|
mgw
|
dbcf8b1089
|
申请编程状态控制
|
2025-01-20 14:02:54 +08:00 |
|
yuxianghui
|
a96a9f5b75
|
1、修改工单检测结果只读条件；2、修改质检单完成时同步完成工单判断条件；3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件
|
2025-01-20 12:47:11 +08:00 |
|
yuxianghui
|
9e2704f726
|
新增工单送检按钮显示的时候隐藏完成按钮
|
2025-01-20 10:34:32 +08:00 |
|
胡尧
|
c436bbea46
|
Merge branch 'release/release_2.8' into feature/验证合并的逻辑
|
2025-01-17 16:12:27 +08:00 |
|
yuxianghui
|
41cdeb7fd9
|
制造订单状态优化
|
2025-01-17 11:06:17 +08:00 |
|
mgw
|
f3e64b007e
|
调整扫码字段位置
|
2025-01-17 09:59:46 +08:00 |
|
mgw
|
eed89836e1
|
调整扫码字段位置
|
2025-01-17 09:36:37 +08:00 |
|
胡尧
|
19e1b16122
|
屏蔽将制造订单的补货组修改为不同的代码
|
2025-01-17 09:27:38 +08:00 |
|
mgw
|
0b2b9c2bf5
|
恢复屏蔽
|
2025-01-16 17:39:34 +08:00 |
|
mgw
|
2dc54792f4
|
调整扫码字段的位置
|
2025-01-16 17:10:55 +08:00 |
|
yuxianghui
|
39d6c8ae24
|
处理制造订单再次返工时，点击返工按钮报错
|
2025-01-16 15:41:07 +08:00 |
|
yuxianghui
|
1e71fc1b08
|
Merge branch 'feature/制造订单状态优化' into feature/质检单优化_1
|
2025-01-16 14:51:51 +08:00 |
|
yuxianghui
|
add528f0f3
|
1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件；2、工单添加质检单跳转按钮
|
2025-01-16 14:51:04 +08:00 |
|
管欢
|
c7265bdb46
|
Accept Merge Request #1771: (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/1771
|
2025-01-16 12:50:47 +08:00 |
|
廖丹龙
|
f93edef2d3
|
Accept Merge Request #1770: (feature/customer_supply -> 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/1770
|
2025-01-16 12:42:28 +08:00 |
|
liaodanlong
|
5c780c7b82
|
客供料合并
|
2025-01-16 11:35:37 +08:00 |
|
liaodanlong
|
303fcd0430
|
修改采购单非询价状态只读
|
2025-01-16 11:24:21 +08:00 |
|
guanhuan
|
e57574783f
|
修复设备档案页面数据显示
|
2025-01-16 10:28:30 +08:00 |
|
yuxianghui
|
e3562e7ae3
|
1、制造订单状态优化
|
2025-01-16 09:01:11 +08:00 |
|
yuxianghui
|
5ff6fe73d4
|
点击制造订单触发返工的过滤条件优化
|
2025-01-15 15:40:19 +08:00 |
|
yuxianghui
|
93eb588f91
|
Merge branch 'feature/工单-制造订单优化' into feature/返工功能优化
|
2025-01-15 14:37:46 +08:00 |
|
yuxianghui
|
5297bf05d1
|
1、制造订单返工按钮添加新的显示条件；2、优化返工流程
|
2025-01-15 14:36:49 +08:00 |
|
mgw
|
03c317542a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-01-15 13:36:34 +08:00 |
|
mgw
|
ece136e71e
|
解除屏蔽
|
2025-01-15 13:36:05 +08:00 |
|
马广威
|
e0452283f6
|
Accept Merge Request #1765: (feature/制造功能优化 -> develop)
Merge Request: 调整扫码widget
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1765?initial=true
|
2025-01-15 11:35:00 +08:00 |
|
yuxianghui
|
1b9dbffcce
|
Merge branch 'feature/质检单优化' into feature/工单-制造订单优化
|
2025-01-15 11:26:01 +08:00 |
|
yuxianghui
|
8d5d19ec69
|
1、质检单通过、失败按钮添加工单为返工时隐藏条件；2、处理夹具入库到夹具房时，夹具查询中夹具可用状态没有变更为可用问题；3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题
|
2025-01-15 11:25:00 +08:00 |
|
mgw
|
ca3015600a
|
调整扫码widget
|
2025-01-15 10:18:25 +08:00 |
|
胡尧
|
f79fa75a68
|
Accept Merge Request #1762: (feature/customer_supply -> 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/1762#mr-1762-review-218183
|
2025-01-15 08:43:31 +08:00 |
|
liaodanlong
|
f4f87555a8
|
排除坯料制造订单
|
2025-01-15 01:44:48 +08:00 |
|
liaodanlong
|
adbf5a6a0d
|
隐藏欠单
|
2025-01-14 21:03:27 +08:00 |
|
yuxianghui
|
bf3256c4bc
|
Merge branch 'feature/工单-质检优化_3' into feature/质检单优化
|
2025-01-14 16:22:59 +08:00 |
|
yuxianghui
|
847b7da8f7
|
处理 质检单确认合格或者不合格时报错 bug
|
2025-01-14 16:22:17 +08:00 |
|
mgw
|
2a9d19436a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-01-14 16:21:07 +08:00 |
|