胡尧
|
8a7a90ff0d
|
agv配置不可修改
|
2025-04-07 17:04:34 +08:00 |
|
胡尧
|
4cbcf08da8
|
销售单默认筛选供货方式待确认
|
2025-03-27 16:10:07 +08:00 |
|
胡尧
|
4b6f04aa9d
|
修改字段显示位置
|
2025-03-27 15:51:16 +08:00 |
|
liaodanlong
|
d2155b17b4
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/product_template.py
|
2025-03-26 17:01:13 +08:00 |
|
guanhuan
|
236158d556
|
调拨单零件图号信息搜索
|
2025-03-26 13:35:28 +08:00 |
|
胡尧
|
5ae167c133
|
去掉取消自动加工原因
|
2025-03-24 09:00:16 +08:00 |
|
胡尧
|
d571b77915
|
修改工单新模型显示
|
2025-03-13 14:50:26 +08:00 |
|
胡尧
|
ad8ec770b6
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 09:17:33 +08:00 |
|
管欢
|
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 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
胡尧
|
dedc820b50
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-10 16:31:35 +08:00 |
|
guanhuan
|
0d7f348194
|
调拨列表采购订单询价单页面优化
|
2025-03-07 11:29:32 +08:00 |
|
胡尧
|
cb645aa1b9
|
增加自动化产线的零件供货路线初始化为自动化产线加工
|
2025-03-06 13:59:14 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|
yuxianghui
|
7d4314abc7
|
完成 工单子页签可全量配置
|
2025-03-05 11:24:48 +08:00 |
|
胡尧
|
e8fc38e6ed
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-04 09:32:07 +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 |
|
胡尧
|
52e585e637
|
解决冲突
|
2025-02-20 13:51:24 +08:00 |
|
胡尧
|
05dac9fb0c
|
调整模型上传的流程
|
2025-02-20 13:36:05 +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 |
|