mgw
|
46d1c9a83d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-27 14:00:58 +08:00 |
|
mgw
|
92adde7909
|
处理空值情况
|
2025-02-27 14:00:41 +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 |
|
mgw
|
b6165e333b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-27 13:54:46 +08:00 |
|
mgw
|
ed17444f21
|
统一处理质检单
|
2025-02-27 13:54:28 +08:00 |
|
liaodanlong
|
20932f9d51
|
人工线下加工表面工艺逻辑修改
|
2025-02-27 13:46:30 +08:00 |
|
yuxianghui
|
919717ccc5
|
处理工单外协创建的外协出入库单没有质检单的问题
|
2025-02-27 13:13:22 +08:00 |
|
mgw
|
b693252a7b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-27 11:32:29 +08:00 |
|
mgw
|
88fceb016f
|
调整单据状态
|
2025-02-27 11:26:26 +08:00 |
|
mgw
|
d1a71e1a05
|
完善单据
|
2025-02-27 10:58:06 +08:00 |
|
mgw
|
7af9b25eee
|
取消列表单据只读
|
2025-02-27 09:58:12 +08:00 |
|
mgw
|
f234943104
|
调整行号
|
2025-02-27 09:16:50 +08:00 |
|
mgw
|
d608b78f8c
|
坯料外协单据
|
2025-02-27 09:04:38 +08:00 |
|
mgw
|
513daa7c2b
|
补全单据
|
2025-02-26 17:39:34 +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 |
|
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 |
|
mgw
|
dbaf5342fc
|
去除对切割工单的编程控制
|
2025-02-26 13:09:15 +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 |
|
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 |
|
mgw
|
0be9afcdfe
|
修改变量名
|
2025-02-26 10:13:26 +08:00 |
|
mgw
|
e3b2dade15
|
调整判断逻辑
|
2025-02-26 10:06:27 +08:00 |
|
mgw
|
f89b52bad1
|
修改状态名称
|
2025-02-26 09:58:16 +08:00 |
|
mgw
|
f06951958d
|
sf-工厂取消接单-取消列表展示数据问题
|
2025-02-26 09:54:08 +08:00 |
|
mgw
|
dca6f9fb53
|
sf-工厂取消接单-坯料的制造订单未取消
|
2025-02-26 09:40:18 +08:00 |
|
liaodanlong
|
c4c6386871
|
坯料的采购订单零件图号，零件名称显示
|
2025-02-26 09:37:56 +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 |
|
yuxianghui
|
fb4f08a24a
|
1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题；2、质检完成的消息通知添加超链接；3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件
|
2025-02-25 15:05:30 +08:00 |
|