liaodanlong
|
09ba001b06
|
sf-生产环境-客供料入库单-合并后的客供料入库单的零件图号显示名称不正确
|
2025-02-24 13:38:02 +08:00 |
|
廖丹龙
|
3c349c3346
|
Accept Merge Request #1832: (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/1832?initial=true
|
2025-02-21 16:47:25 +08:00 |
|
liaodanlong
|
e1185aa28b
|
子制造订单回退功能处理 处理解除装夹没有回退按钮
|
2025-02-21 15:22:00 +08:00 |
|
胡尧
|
70855a4936
|
Accept Merge Request #1830: (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/1830?initial=true
|
2025-02-21 14:29:46 +08:00 |
|
胡尧
|
1bbdf2bd44
|
取消配送路线关联字段修改
|
2025-02-21 14:29:15 +08:00 |
|
廖丹龙
|
3da67f27ec
|
Accept Merge Request #1829: (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/1829?initial=true
|
2025-02-21 10:30:16 +08:00 |
|
liaodanlong
|
d8e8babbd3
|
工单详情添加回退按钮
|
2025-02-21 10:28:12 +08:00 |
|
管欢
|
5d00c1018b
|
Accept Merge Request #1827: (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/1827
|
2025-02-20 16:28:20 +08:00 |
|
liaodanlong
|
416a63138a
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2025-02-20 15:48:22 +08:00 |
|
liaodanlong
|
75460c5df6
|
制造订单 工单回退
|
2025-02-20 15:38:37 +08:00 |
|
liaodanlong
|
162a1061de
|
制造订单 工单回退
|
2025-02-20 14:08:06 +08:00 |
|
guanhuan
|
8e27ee2434
|
修复取消订单状态已更新时的提示
|
2025-02-20 10:25:56 +08:00 |
|
mgw
|
9fce93e1ef
|
调整工单状态改变逻辑
|
2025-02-17 17:34:54 +08:00 |
|
mgw
|
5d2cadc3d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-17 15:37:58 +08:00 |
|
mgw
|
567ea84b00
|
完善人工编程功能
|
2025-02-17 15:37:30 +08:00 |
|
胡尧
|
d25022204b
|
Accept Merge Request #1808: (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/1808?initial=true
|
2025-02-17 13:24:31 +08:00 |
|
胡尧
|
8095a8a972
|
修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件
|
2025-02-17 13:23:32 +08:00 |
|
yuxianghui
|
fc4eae0488
|
完成 入库优化：自动确认序列号 需求
|
2025-02-17 12:42:07 +08:00 |
|
mgw
|
e98a9a3788
|
增加取消订单其他功能
|
2025-02-14 17:29:33 +08:00 |
|
mgw
|
3ac096e9a7
|
取消接单需求进行中
|
2025-02-13 17:41:18 +08:00 |
|
胡尧
|
3130ef4983
|
增加工单的开始时间已经leave_id字段的监控，异常则发送企业微信消息
|
2025-02-13 15:48:41 +08:00 |
|
胡尧
|
68e9537cdb
|
Accept Merge Request #1802: (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/1802?initial=true
|
2025-02-12 15:34:34 +08:00 |
|
胡尧
|
2411d8334c
|
修改客供料的供货路线不能选择外购
|
2025-02-12 15:33:57 +08:00 |
|
yuxianghui
|
c223869bbd
|
Merge branch 'feature/销售视图优化' into feature/库存优化
|
2025-02-12 11:30:27 +08:00 |
|
mgw
|
523cc4ac5e
|
增加人工线下加工工单的查找
|
2025-02-10 11:29:37 +08:00 |
|
mgw
|
9695997542
|
人工线下加工编程方式设置
|
2025-02-10 10:58:01 +08:00 |
|
mgw
|
ffde591b3c
|
人工线下加工默认加工面ZM
|
2025-02-10 09:12:58 +08:00 |
|
yuxianghui
|
bc4806b303
|
1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求
|
2025-02-08 16:47:06 +08:00 |
|
mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +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 |
|
胡尧
|
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 |
|
mgw
|
dbcf8b1089
|
申请编程状态控制
|
2025-01-20 14:02:54 +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 |
|
胡尧
|
19e1b16122
|
屏蔽将制造订单的补货组修改为不同的代码
|
2025-01-17 09:27:38 +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 |
|
廖丹龙
|
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 |
|