mgw
|
bd43de74dd
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-10 17:10:46 +08:00 |
|
mgw
|
1541326dfc
|
增加排程单取消
|
2025-03-10 14:56:42 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|
yuxianghui
|
7d4314abc7
|
完成 工单子页签可全量配置
|
2025-03-05 11:24:48 +08:00 |
|
mgw
|
7e93586f69
|
人工建立销售单取第一份bom
|
2025-03-04 11:40:39 +08:00 |
|
马广威
|
4bff6e4355
|
Accept Merge Request #1889: (release/release_2.9 -> develop)
Merge Request: 调整名称与提示语
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1889?initial=true
|
2025-02-28 17:45:56 +08:00 |
|
mgw
|
98b4c53213
|
调整名称与提示语
|
2025-02-28 17:35:32 +08:00 |
|
廖丹龙
|
ec1da84da0
|
Accept Merge Request #1888: (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/1888
|
2025-02-28 16:38:23 +08:00 |
|
liaodanlong
|
4c8cf5caf8
|
制造订单状态为返工时限制表面工艺工单状态
|
2025-02-28 16:36:16 +08:00 |
|
马广威
|
aa1517ebce
|
Accept Merge Request #1887: (release/release_2.9 -> develop)
Merge Request: 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1887?initial=true
|
2025-02-28 16:06:04 +08:00 |
|
mgw
|
c24f539197
|
取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误
|
2025-02-28 16:04:49 +08:00 |
|
yuxianghui
|
eb69e20f01
|
Merge branch 'feature/外协优化' into feature/外协优化_1
|
2025-02-28 08:37:41 +08:00 |
|
yuxianghui
|
76f9b5ef3e
|
处理特殊表面工艺外协入库单点击【验证】报错
|
2025-02-28 08:36:12 +08:00 |
|
廖丹龙
|
8fd536324e
|
Accept Merge Request #1884: (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/1884
|
2025-02-27 15:11:21 +08:00 |
|
liaodanlong
|
3bcc673d88
|
人工线下加工表面工艺逻辑还原
|
2025-02-27 15:09:14 +08:00 |
|
mgw
|
19eb6519c0
|
组件制造调拨外置
|
2025-02-27 14:53:23 +08:00 |
|
mgw
|
bae6d4d59b
|
调整名称等
|
2025-02-27 14:37:03 +08:00 |
|
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 |
|