管欢
|
e87689da33
|
Accept Merge Request #1896: (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/1896
|
2025-03-13 08:48:04 +08:00 |
|
guanhuan
|
0d7f348194
|
调拨列表采购订单询价单页面优化
|
2025-03-07 11:29:32 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|
yuxianghui
|
7d4314abc7
|
完成 工单子页签可全量配置
|
2025-03-05 11:24:48 +08:00 |
|
mgw
|
2035dd6857
|
切割工单隐藏编程相关
|
2025-02-26 12:42:42 +08:00 |
|
mgw
|
dca6f9fb53
|
sf-工厂取消接单-坯料的制造订单未取消
|
2025-02-26 09:40:18 +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 |
|
liaodanlong
|
7975fd2bd2
|
CNC回退后需开放送检按钮
|
2025-02-25 16:32:04 +08:00 |
|
yuxianghui
|
8c14ea4a85
|
Merge branch 'feature/库存功能优化' into feature/库存优化_3
|
2025-02-24 16:27:49 +08:00 |
|
yuxianghui
|
eb11e71d0d
|
1、入库单据优化：单据就绪自动分配序列号；分配序列号时，流水号取值=MAX（产品序列号模型最大序号，预分配最大序号），界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化
|
2025-02-24 16:27:09 +08:00 |
|
胡尧
|
e2edd38a8e
|
Accept Merge Request #1831: (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/1831?initial=true
|
2025-02-21 14:48:34 +08:00 |
|
胡尧
|
16b5ce300a
|
修复库存有两个驾驶舱菜单的bug
|
2025-02-21 14:48:01 +08:00 |
|
liaodanlong
|
d8e8babbd3
|
工单详情添加回退按钮
|
2025-02-21 10:28:12 +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
|
162a1061de
|
制造订单 工单回退
|
2025-02-20 14:08:06 +08:00 |
|
mgw
|
0969967570
|
修复完善取消订单问题
|
2025-02-19 15:14:05 +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 |
|
hyyy
|
b117fde8c3
|
删除模块，移到efms里面，修改样式
|
2025-02-14 17:31:19 +08:00 |
|
mgw
|
3ac096e9a7
|
取消接单需求进行中
|
2025-02-13 17:41:18 +08:00 |
|
mgw
|
6b9428c8bf
|
多种状态下显示拒绝接单/取消按钮
|
2025-02-10 16:38:34 +08:00 |
|
mgw
|
027be2b021
|
调整工单处人工编程可见
|
2025-02-10 13:33:46 +08:00 |
|
mgw
|
44f29d001e
|
调整人工线下加工页面内容
|
2025-02-08 14:08:53 +08:00 |
|
mgw
|
88840abf9f
|
制造订单编程状态搜索的优化需求
|
2025-02-08 13:32:40 +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 |
|
guanhuan
|
dc843588e9
|
制造列表新增编程状态显示
|
2025-01-20 14:09:23 +08:00 |
|
yuxianghui
|
a96a9f5b75
|
1、修改工单检测结果只读条件；2、修改质检单完成时同步完成工单判断条件；3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件
|
2025-01-20 12:47:11 +08:00 |
|
yuxianghui
|
9e2704f726
|
新增工单送检按钮显示的时候隐藏完成按钮
|
2025-01-20 10:34:32 +08:00 |
|
mgw
|
f3e64b007e
|
调整扫码字段位置
|
2025-01-17 09:59:46 +08:00 |
|
mgw
|
eed89836e1
|
调整扫码字段位置
|
2025-01-17 09:36:37 +08:00 |
|
mgw
|
0b2b9c2bf5
|
恢复屏蔽
|
2025-01-16 17:39:34 +08:00 |
|
mgw
|
2dc54792f4
|
调整扫码字段的位置
|
2025-01-16 17:10:55 +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 |
|
管欢
|
c7265bdb46
|
Accept Merge Request #1771: (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/1771
|
2025-01-16 12:50:47 +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
|
303fcd0430
|
修改采购单非询价状态只读
|
2025-01-16 11:24:21 +08:00 |
|
guanhuan
|
e57574783f
|
修复设备档案页面数据显示
|
2025-01-16 10:28:30 +08:00 |
|
yuxianghui
|
93eb588f91
|
Merge branch 'feature/工单-制造订单优化' into feature/返工功能优化
|
2025-01-15 14:37:46 +08:00 |
|
yuxianghui
|
5297bf05d1
|
1、制造订单返工按钮添加新的显示条件；2、优化返工流程
|
2025-01-15 14:36:49 +08:00 |
|
mgw
|
ece136e71e
|
解除屏蔽
|
2025-01-15 13:36:05 +08:00 |
|
mgw
|
ca3015600a
|
调整扫码widget
|
2025-01-15 10:18:25 +08:00 |
|
胡尧
|
f79fa75a68
|
Accept Merge Request #1762: (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/1762#mr-1762-review-218183
|
2025-01-15 08:43:31 +08:00 |
|
liaodanlong
|
adbf5a6a0d
|
隐藏欠单
|
2025-01-14 21:03:27 +08:00 |
|