mgw
|
391a172016
|
修复制造订单加工无状态问题
|
2024-05-11 22:42:58 +08:00 |
|
yuxianghui
|
384b032ef3
|
Merge branch 'feature/解决坯料外协不生成外协出库单bug' into feature/解决主流程bug
|
2024-05-11 16:36:17 +08:00 |
|
yuxianghui
|
0ddf2ce1bd
|
1、等待组件状态的装夹预调工单点击【开始】时，没有组件给提示信息；2、隐藏装夹预调工单列表看板，3、库存-内部调拨-产品是刀具物料除刀柄外，其他刀具物料目标货位添加必填校验；
|
2024-05-11 16:34:29 +08:00 |
|
jinling.yang
|
76b7d00643
|
1.模版类型的成品，坯料，表面工艺模版的工序新增过滤2.表面工艺可选参数的适用材料修改为可编辑
|
2024-05-11 15:35:15 +08:00 |
|
jinling.yang
|
50dc25a8b7
|
还原注释代码
|
2024-05-11 13:51:52 +08:00 |
|
jinling.yang
|
b80df25e0a
|
注释代码为第二期同一产品多个编程单需求
|
2024-05-11 13:44:30 +08:00 |
|
jinling.yang
|
999959b6a1
|
1.修复工件配送向导制造订单号能显示5个
2工件配送向导页面优化
3.生成制造订单同时工件配送默认路线
|
2024-05-11 13:38:57 +08:00 |
|
jinling.yang
|
ec01b89242
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-05-11 00:20:08 +08:00 |
|
jinling.yang
|
2bffc5964a
|
1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码（第二期）3.优化部分页面
|
2024-05-11 00:17:43 +08:00 |
|
mgw
|
d9543d42fd
|
在工单完成处控制状态，来避免非正常操作导致的制造订单状态异常问题
|
2024-05-10 16:01:33 +08:00 |
|
jinling.yang
|
b5c9387d8c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
|
2024-05-09 21:58:45 +08:00 |
|
jinling.yang
|
3d56e54fb2
|
优化制造订单的获取cnc程序
|
2024-05-09 18:29:30 +08:00 |
|
mgw
|
e2d3b36683
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2024-05-09 14:51:42 +08:00 |
|
mgw
|
138e22255e
|
为工单预计时间增加初始值
|
2024-05-09 14:51:21 +08:00 |
|
jinling.yang
|
6a4fd4d922
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程
|
2024-05-09 11:11:16 +08:00 |
|
jinling.yang
|
1a63f82f4b
|
优化agv调用中控接驳站接口
|
2024-05-09 11:04:59 +08:00 |
|
jinling.yang
|
0ea3d6f0b3
|
优化agv接驳站
|
2024-05-09 11:04:07 +08:00 |
|
jinling.yang
|
54a08802d9
|
修复装夹工单状态
|
2024-05-09 10:45:14 +08:00 |
|
jinling.yang
|
388b0b4e4c
|
优化制造
|
2024-05-09 10:37:41 +08:00 |
|
mgw
|
8c279828be
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-05-09 09:25:19 +08:00 |
|
yuxianghui
|
92ea9b2a4f
|
Merge branch 'feature/坯料采购-外协与自加工流程BUG' into feature/解决工单Rfid相关bug
|
2024-05-08 16:53:00 +08:00 |
|
yuxianghui
|
5eacc01755
|
1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷， 添加工单扫描的Rfid不是托盘是其他物料的提示；2、解决刀具管理模块的菜单依赖问题；3、管理员添加货位的操作权限
|
2024-05-08 16:50:13 +08:00 |
|
jinling.yang
|
d964a9feb1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径
|
2024-05-08 11:20:07 +08:00 |
|
jinling.yang
|
30053c5493
|
修复工件配送rfidcode没有值
|
2024-05-08 09:27:24 +08:00 |
|
jinling.yang
|
fda43deeea
|
1.优化根据同一个产品，生成的制造订单绑定同一个编程单需求
|
2024-05-07 17:33:23 +08:00 |
|
jinling.yang
|
b8196cc4a9
|
1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线
|
2024-05-07 14:44:58 +08:00 |
|
jinling.yang
|
ed41667477
|
1.采购去掉审核2.装夹预调工单验证优化
|
2024-05-06 16:29:54 +08:00 |
|
jinling.yang
|
848fe9f2f0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送
|
2024-05-06 11:48:53 +08:00 |
|
jinling.yang
|
2cd666c4ae
|
优化agv及新增中控日志调用
|
2024-05-06 11:48:34 +08:00 |
|
mgw
|
9d157d6083
|
处理工单可能为记录集的问题
|
2024-05-06 11:29:17 +08:00 |
|
jinling.yang
|
68d8c36755
|
优化工件配送
|
2024-04-30 17:05:09 +08:00 |
|
jinling.yang
|
b45ffcc0d2
|
1.优化工件配送向导2.增加rfid码字段
|
2024-04-29 17:34:00 +08:00 |
|
yuxianghui
|
a1f0a580a6
|
解决 工具装夹岗在工件装夹单详情扫描rfid码报错 bug
|
2024-04-29 17:25:29 +08:00 |
|
jinling.yang
|
58344b09d2
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-04-29 15:33:41 +08:00 |
|
jinling.yang
|
b1d42b9421
|
优化工件配送和空料架
|
2024-04-29 15:31:46 +08:00 |
|
mgw
|
3a22c817df
|
修复工单实际开始时间
|
2024-04-29 12:15:54 +08:00 |
|
jinling.yang
|
45220d75af
|
新增运送空料架
|
2024-04-28 17:34:41 +08:00 |
|
jinling.yang
|
bc2c0f7fb0
|
修复站点状态未变，及页面筛选框优化
|
2024-04-28 15:17:41 +08:00 |
|
jinling.yang
|
24722f474c
|
修复配送时agv站点验证
|
2024-04-28 11:43:11 +08:00 |
|
jinling.yang
|
5eb946d936
|
优化agv需求
|
2024-04-28 11:34:17 +08:00 |
|
jinling.yang
|
42178e3e1e
|
上下产线接口新增IsComplete判断
|
2024-04-26 18:04:30 +08:00 |
|
jinling.yang
|
8f9781dd13
|
修复工件配送时间
|
2024-04-26 14:44:26 +08:00 |
|
jinling.yang
|
41e551fe48
|
优化工件配送
|
2024-04-26 13:57:47 +08:00 |
|
jinling.yang
|
9eb891dd0b
|
优化agv及工件配送
|
2024-04-26 09:56:42 +08:00 |
|
jinling.yang
|
8bbb18b6f4
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送
|
2024-04-25 15:43:30 +08:00 |
|
jinling.yang
|
11864feaa4
|
优化工件配送
|
2024-04-25 15:43:02 +08:00 |
|
yuxianghui
|
53ed0d76a6
|
Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理
# Conflicts:
# sf_manufacturing/views/mrp_production_addional_change.xml
|
2024-04-25 14:10:22 +08:00 |
|
yuxianghui
|
9d96e0681c
|
1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）；
|
2024-04-25 14:02:51 +08:00 |
|
mgw
|
f4433ac3cc
|
增加工单处的尺寸赋值
|
2024-04-25 09:03:17 +08:00 |
|
mgw
|
0bcd077914
|
优化制造订单状态问题
|
2024-04-24 22:53:48 +08:00 |
|