mgw
|
ddfb233452
|
修复按钮固定条件显示问题
|
2024-09-23 08:55:23 +08:00 |
|
mgw
|
7d877a0cbb
|
处理提示词制造订单重复问题；处理获取数据按钮显隐问题
|
2024-09-20 11:45:23 +08:00 |
|
jinling.yang
|
63ac4f2b44
|
返工工单添加标签字段
|
2024-09-19 17:23:01 +08:00 |
|
mgw
|
27da7639b2
|
增加扫码点击按钮功能
|
2024-09-19 09:04:05 +08:00 |
|
mgw
|
0ae7424f04
|
获取数据按钮增加调用服务功能
|
2024-09-10 16:12:24 +08:00 |
|
liaodanlong
|
6711f6f6e6
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-09 17:37:21 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
liaodanlong
|
64180ca57f
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-02 15:43:25 +08:00 |
|
liaodanlong
|
3624ef4755
|
销售订单价格问题处理
|
2024-08-30 16:30:34 +08:00 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
liaodanlong
|
e49362e2e3
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-08-27 14:04:13 +08:00 |
|
liaodanlong
|
d5b5231873
|
多面加工工单排程优化
|
2024-08-27 14:03:41 +08:00 |
|
mgw
|
78d00e9157
|
修复coding问题，增加机床类型返回
|
2024-08-26 13:23:44 +08:00 |
|
jinling.yang
|
ba986995ed
|
修复报废-工单状态
|
2024-08-21 16:53:32 +08:00 |
|
jinling.yang
|
8a6ebb331a
|
Merge branch 'feature/优化最新版报废' into develop
|
2024-08-20 14:39:21 +08:00 |
|
mgw
|
6fe56605ab
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
|
2024-08-20 11:27:34 +08:00 |
|
mgw
|
bf2c7fd3c5
|
增加解绑托盘功能
|
2024-08-20 11:27:18 +08:00 |
|
胡尧
|
dc5b68cca0
|
生产总监、机床操作岗增加agv调度菜单权限，AGV下发任务界面需二次确认
|
2024-08-20 10:45:31 +08:00 |
|
mgw
|
1d399527e0
|
增加装夹预调工单扫码开启
|
2024-08-20 10:42:36 +08:00 |
|
胡尧
|
1b521ae460
|
解决冲突
|
2024-08-16 09:50:31 +08:00 |
|
胡尧
|
4e0d8f1c88
|
修改AGV调度
|
2024-08-16 09:43:03 +08:00 |
|
胡尧
|
aecf2121a1
|
agv调度开发
|
2024-08-15 17:41:25 +08:00 |
|
jinling.yang
|
e2d7576a5e
|
优化报废
|
2024-08-15 17:31:37 +08:00 |
|
胡尧
|
f7e4ce416a
|
AGV任务调度开发
|
2024-08-14 17:34:50 +08:00 |
|
jinling.yang
|
9a7ac4dfa6
|
优化制造订单报废向导
|
2024-08-09 17:26:57 +08:00 |
|
胡尧
|
a79500d0ad
|
增加agv调度系统
|
2024-08-08 17:47:03 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
jinling.yang
|
9eddfe36d6
|
修复返工-工件配送
|
2024-07-25 15:22:48 +08:00 |
|
jinling.yang
|
f59299d4d5
|
修复工件配送按钮显示
|
2024-07-24 15:06:50 +08:00 |
|
jinling.yang
|
f0fdeff699
|
修复cnc工单按钮显示问题
|
2024-07-24 11:40:16 +08:00 |
|
yuxianghui
|
f3a7dcc6a4
|
Merge branch 'feature/无效刀返工' into feature/NC程序和功能刀具校验
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-22 11:36:29 +08:00 |
|
jinling.yang
|
28843b0733
|
修复返工bug
|
2024-07-22 10:57:43 +08:00 |
|
jinling.yang
|
8a0c968b10
|
修复返工bug
|
2024-07-19 17:25:51 +08:00 |
|
yuxianghui
|
25ac346cb7
|
1、cnc编程单tree视图展示刀具状态字段；2、优化制造订单的功能刀具状态字段自动更新方法，同时当工单刀具状态变化时变更缺刀备注信息，添加状态为无效刀的备注字段；3、优化当功能刀具从【刀具房】到【制造前】时进行校验，校验是否为制造订单所缺的刀，如果是则修改cnc编程单刀具状态为正常；4、优化cnc用刀校验：添加对无效刀的处理(无效刀时触发返工流程，并生成检测结果数据)，优化生成的待处理数据的数据结构；
|
2024-07-18 16:33:41 +08:00 |
|
jinling.yang
|
33bf88968c
|
修复返工bug
|
2024-07-18 16:17:19 +08:00 |
|
yuxianghui
|
70b8521b90
|
Merge branch 'feature/销售订单、工单优化' into feature/无效刀返工
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-17 16:57:11 +08:00 |
|
jinling.yang
|
5e83fb382f
|
还原rfid代码
|
2024-07-17 15:37:20 +08:00 |
|
yuxianghui
|
3eca74518a
|
Merge branch 'feature/CNC功能刀具用刀校验' into feature/销售订单、工单优化
|
2024-07-16 10:41:56 +08:00 |
|
jinling.yang
|
7885794322
|
1.优化制造订单的检测结果:新增处理结果字段
2.优化制造订单的返工向导：加工面字段类型改为多对多，且该字段需根据处理结果为待处理的检测结果的加工面进行过滤
3.优化工单工件下产线接口：工单状态为待检测
4,.优化工单状态方法(_compute_state)
|
2024-07-12 17:32:53 +08:00 |
|
jinling.yang
|
7152b54017
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工
# Conflicts:
# sf_manufacturing/views/mrp_workorder_view.xml
|
2024-07-11 17:38:38 +08:00 |
|
jinling.yang
|
9aca786522
|
1.优化工单排序2.新增调取cloud编程单的状态方法3.制造订单添加状态为返工及编程状态为"已编程"，“已编程未下发”的过滤条件4，新增返工且编程中的制造订单定时获取Cloud编程单状态的定时器
|
2024-07-10 17:36:26 +08:00 |
|
yuxianghui
|
129f8a4d7d
|
1、重构工单cnc编程用刀校验方法；制造订单、工单、cnc编程单添加刀具状态字段，并且根据cnc编程单刀具状态自动计算制造订单、工单刀具状态字段的值；制造订单form页新增展示功能刀具状态字段；2、功能刀具拆解单刀具物料选择目标货位添加过滤添加为只选择所属货区是刀具房的货位；
|
2024-07-10 16:23:24 +08:00 |
|
jinling.yang
|
7533d23d3e
|
1.工单状态新增‘返工’，2，在制造订单上点击返工选择加工面确认后，新增加工面的对应工单及新增重置cloud的编程单的状态3.优化返工向导
|
2024-07-09 17:36:47 +08:00 |
|
mgw
|
ed4903b6f1
|
解除装夹处打印成品二维码
|
2024-07-09 10:18:13 +08:00 |
|
jinling.yang
|
b383a6d229
|
1.新增加工面模型2.制造订单详情页面的返工操作上的加工面根据产品的加工面板进行过滤
|
2024-07-08 17:33:04 +08:00 |
|
jinling.yang
|
52fa229896
|
优化制造订单菜单
|
2024-07-04 17:31:03 +08:00 |
|
jinling.yang
|
050e82673a
|
优化cnc工单
|
2024-07-04 15:38:43 +08:00 |
|
jinling.yang
|
a7a8e73616
|
新增返工向导
|
2024-07-03 17:35:29 +08:00 |
|
jinling.yang
|
1b174c5805
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-06-30 14:41:38 +08:00 |
|