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

5584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
2cc7386027 质量检查优化 2025-03-10 17:10:27 +08:00
mgw
1541326dfc 增加排程单取消 2025-03-10 14:56:42 +08:00
马广威
28a3d52aea Accept Merge Request #1890: (feature/制造功能优化 -> develop) 
Merge Request: 人工建立销售单取第一份bom

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1890?initial=true
 2025-03-04 11:42:02 +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
禹翔辉
72620236ab Accept Merge Request #1886: (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/1886
 2025-02-28 08:39:01 +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
胡尧
04f697ae7b Merge branch 'develop' into release/release_2.9 2025-02-27 17:08:59 +08:00
廖丹龙
d5e93b14be Accept Merge Request #1885: (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/1885
 2025-02-27 16:14:24 +08:00
liaodanlong
d4f42abfd8 隐藏发料出库的批量调拨按钮 2025-02-27 16:12:12 +08:00
mgw
07c07ef37c 完善下游单据问题 2025-02-27 16:00:29 +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
22c5ee6806 隐藏收料入库的批量调拨按钮 2025-02-27 15:09:57 +08:00
liaodanlong
3bcc673d88 人工线下加工表面工艺逻辑还原 2025-02-27 15:09:14 +08:00
马广威
90a7a025b1 Accept Merge Request #1883: (feature/制造功能优化 -> develop) 
Merge Request: 组件制造调拨外置

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1883?initial=true
 2025-02-27 14:54:13 +08:00
mgw
95929fa01c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-27 14:53:41 +08:00
mgw
19eb6519c0 组件制造调拨外置 2025-02-27 14:53:23 +08:00
马广威
188e1fc553 Accept Merge Request #1882: (feature/制造功能优化 -> develop) 
Merge Request: 调整名称等

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1882?initial=true
 2025-02-27 14:37:47 +08:00
mgw
197f1f65ea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-27 14:37:21 +08:00
mgw
bae6d4d59b 调整名称等 2025-02-27 14:37:03 +08:00
马广威
211e9c58f1 Accept Merge Request #1881: (feature/制造功能优化 -> develop) 
Merge Request: 处理空值情况

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1881?initial=true
 2025-02-27 14:01:33 +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
马广威
1efb6be453 Accept Merge Request #1880: (feature/制造功能优化 -> develop) 
Merge Request: 统一处理质检单

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1880?initial=true
 2025-02-27 13:55:19 +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
禹翔辉
43904c0249 Accept Merge Request #1878: (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/1878?initial=true
 2025-02-27 13:14:24 +08:00
yuxianghui
919717ccc5 处理工单外协创建的外协出入库单没有质检单的问题 2025-02-27 13:13:22 +08:00
马广威
a4898297b7 Accept Merge Request #1877: (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/1877?initial=true
 2025-02-27 11:33:19 +08:00
mgw
75bbbaa027 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-27 11:32:46 +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
马广威
4db8a29bc1 Accept Merge Request #1876: (feature/制造功能优化 -> develop) 
Merge Request: 调整单据状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1876
 2025-02-27 11:27:05 +08:00
mgw
88fceb016f 调整单据状态 2025-02-27 11:26:26 +08:00
马广威
712e1f3947 Accept Merge Request #1875: (feature/制造功能优化 -> develop) 
Merge Request: 完善单据

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1875?initial=true
 2025-02-27 11:00:19 +08:00
mgw
d1a71e1a05 完善单据 2025-02-27 10:58:06 +08:00
马广威
0c3e730619 Accept Merge Request #1874: (feature/制造功能优化 -> develop) 
Merge Request: 取消列表单据只读

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1874?initial=true
 2025-02-27 09:58:58 +08:00
mgw
0063a199f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-27 09:58:29 +08:00
mgw
7af9b25eee 取消列表单据只读 2025-02-27 09:58:12 +08:00
管欢
7f195f9e5f Accept Merge Request #1873: (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/1873
 2025-02-27 09:54:51 +08:00
guanhuan
000cd9a13c 修复坯料发料提醒重复发送 2025-02-27 09:53:42 +08:00
廖丹龙
3771a62dae Accept Merge Request #1871: (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/1871
 2025-02-27 09:18:55 +08:00
马广威
172219a3e2 Accept Merge Request #1872: (feature/制造功能优化 -> develop) 
Merge Request: 调整行号

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1872?initial=true
 2025-02-27 09:18:15 +08:00