yuxianghui
|
c223869bbd
|
Merge branch 'feature/销售视图优化' into feature/库存优化
|
2025-02-12 11:30:27 +08:00 |
|
yuxianghui
|
7a6538bcc1
|
完成 库存单据列表增加字段【需求数量】 需求
|
2025-02-12 11:29:46 +08:00 |
|
mgw
|
d3cfec2f35
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-12 09:49:54 +08:00 |
|
mgw
|
6b9428c8bf
|
多种状态下显示拒绝接单/取消按钮
|
2025-02-10 16:38:34 +08:00 |
|
马广威
|
f25d06e08f
|
Accept Merge Request #1799: (feature/制造功能优化 -> develop)
Merge Request: 调整工单处人工编程可见
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1799?initial=true
|
2025-02-10 13:35:06 +08:00 |
|
mgw
|
62314d38b3
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-10 13:34:06 +08:00 |
|
mgw
|
027be2b021
|
调整工单处人工编程可见
|
2025-02-10 13:33:46 +08:00 |
|
马广威
|
372dfd99c4
|
Accept Merge Request #1798: (feature/制造功能优化 -> develop)
Merge Request: 人工线下加工工单标识
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1798?initial=true
|
2025-02-10 13:15:01 +08:00 |
|
mgw
|
c702d1f3be
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-10 13:14:25 +08:00 |
|
mgw
|
7e33ca44d0
|
人工线下加工工单标识
|
2025-02-10 13:13:57 +08:00 |
|
马广威
|
c7d9b15624
|
Accept Merge Request #1797: (feature/制造功能优化 -> develop)
Merge Request: 增加人工线下加工工单的查找
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1797
|
2025-02-10 11:30:52 +08:00 |
|
mgw
|
a4d640acb5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-10 11:29:56 +08:00 |
|
mgw
|
523cc4ac5e
|
增加人工线下加工工单的查找
|
2025-02-10 11:29:37 +08:00 |
|
马广威
|
9aa2bd5d54
|
Accept Merge Request #1796: (feature/制造功能优化 -> develop)
Merge Request: 人工线下加工编程方式设置
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1796
|
2025-02-10 11:00:17 +08:00 |
|
mgw
|
ae23edb9d5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-10 10:58:19 +08:00 |
|
mgw
|
9695997542
|
人工线下加工编程方式设置
|
2025-02-10 10:58:01 +08:00 |
|
管欢
|
90243a7d2f
|
Accept Merge Request #1795: (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/1795
|
2025-02-10 09:53:46 +08:00 |
|
guanhuan
|
5dc5602e3d
|
月结取消订单
|
2025-02-10 09:47:42 +08:00 |
|
胡尧
|
cbf58fd3fb
|
Accept Merge Request #1794: (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/1794?initial=true
|
2025-02-10 09:30:49 +08:00 |
|
马广威
|
0ada4933ba
|
Accept Merge Request #1793: (feature/制造功能优化 -> develop)
Merge Request: 人工线下加工默认加工面ZM
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1793?initial=true
|
2025-02-10 09:14:33 +08:00 |
|
mgw
|
b1261bb91b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-10 09:13:16 +08:00 |
|
mgw
|
ffde591b3c
|
人工线下加工默认加工面ZM
|
2025-02-10 09:12:58 +08:00 |
|
胡尧
|
356e1e55e4
|
解决采购总监选择销售员报错的问题
|
2025-02-10 09:03:13 +08:00 |
|
马广威
|
b6ce462171
|
Accept Merge Request #1792: (feature/制造功能优化 -> develop)
Merge Request: 增加人工线下加工程序写入
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1792?initial=true
|
2025-02-08 16:49:34 +08:00 |
|
mgw
|
e8b5ff0b75
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-08 16:48:59 +08:00 |
|
mgw
|
ac3b50c534
|
增加人工线下加工程序写入
|
2025-02-08 16:48:36 +08:00 |
|
yuxianghui
|
bc4806b303
|
1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求
|
2025-02-08 16:47:06 +08:00 |
|
马广威
|
e7bc434d60
|
Accept Merge Request #1791: (feature/制造功能优化 -> develop)
Merge Request: 调整程序写入逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1791?initial=true
|
2025-02-08 16:01:11 +08:00 |
|
mgw
|
2de501b61d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-08 16:00:25 +08:00 |
|
mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +08:00 |
|
马广威
|
e20bf3816a
|
Accept Merge Request #1790: (feature/制造功能优化 -> develop)
Merge Request: 人工线下加工工单也需要走cloud编程流程的优化需求
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1790?initial=true
|
2025-02-08 14:10:19 +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 |
|
胡尧
|
332276752a
|
Accept Merge Request #1789: (feature/mrp_bug_fixed -> develop)
Merge Request: 修复bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1789?initial=true
|
2025-02-07 10:54:56 +08:00 |
|
胡尧
|
d852cf54df
|
修复bug
|
2025-02-07 10:49:17 +08:00 |
|
管欢
|
6756cc201c
|
Accept Merge Request #1788: (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/1788
|
2025-02-06 11:14:52 +08:00 |
|
guanhuan
|
06dd9c12e0
|
人工线下加工工单下发通知修改
|
2025-02-06 10:43:11 +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 |
|
管欢
|
eb47e4c963
|
Accept Merge Request #1787: (feature/工单返工优化 -> develop)
Merge Request: CNC工单返工
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1787
|
2025-01-23 16:48:24 +08:00 |
|
guanhuan
|
5636681ee6
|
CNC工单返工
|
2025-01-23 16:42:16 +08:00 |
|
guanhuan
|
9b49edb290
|
装夹工单返工
|
2025-01-23 13:55:35 +08:00 |
|
liaodanlong
|
b604209df4
|
刀具标准库列表视图添加创建时间与修改时间
|
2025-01-21 16:23:34 +08:00 |
|
liaodanlong
|
a9b4c5d91b
|
保持智能工厂刀具标准库与cloud一致
|
2025-01-21 16:04:16 +08:00 |
|
胡尧
|
39b29960e3
|
Accept Merge Request #1786: (feature/验证合并的逻辑 -> develop)
Merge Request: Merge branch 'develop' into feature/验证合并的逻辑
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1786?initial=true
|
2025-01-21 10:40:27 +08:00 |
|
胡尧
|
6abb237491
|
Merge branch 'develop' into feature/验证合并的逻辑
|
2025-01-21 10:39:41 +08:00 |
|
胡尧
|
b0c043676c
|
Accept Merge Request #1785: (release/release_2.8 -> develop)
Merge Request: 优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1785?initial=true
|
2025-01-21 10:39:19 +08:00 |
|
yuxianghui
|
8f9b7b2fb0
|
优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理
|
2025-01-20 15:39:08 +08:00 |
|