Commit Graph

1296 Commits

Author SHA1 Message Date
zhangzhiqiang
f87dd1690c init:project structure 2023-04-28 14:56:51 +08:00
f8747d1210 Merge remote-tracking branch 'origin/master' 2023-04-27 15:39:44 +08:00
a23eae3cf2 rev 工作模式 2023-04-27 14:21:16 +08:00
778d8fb7df rev 封箱拆箱 2023-04-27 13:33:04 +08:00
a351d652a0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/qd/src/views/wms/st/productOut/ViewDialog.vue
#	mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
#	mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
2023-04-27 10:16:16 +08:00
zhangzhiqiang
34bca47651 Merge remote-tracking branch 'origin/master' 2023-04-25 19:38:51 +08:00
zhangzhiqiang
f0c1387064 rev:接口联调 2023-04-25 19:38:44 +08:00
d1ac61df70 rev 联调问题修改 2023-04-25 17:30:25 +08:00
2313d80660 rev 信号类型 2023-04-25 11:10:19 +08:00
zhangzhiqiang
8c3e1d0a3a add:物料项点 2023-04-24 19:08:57 +08:00
zhangzhiqiang
4460aeb7b2 add:质检基础数据 2023-04-23 16:08:32 +08:00
zhangzhiqiang
1ee9d7362b rev:修改结构 2023-04-23 14:04:45 +08:00
d4a63d1619 rev 缓存线有任务时不下发调度 2023-04-18 12:00:00 +08:00
zhangzhiqiang
edcf960254 rev:成品出入库功能 2023-04-17 20:10:09 +08:00
b762ec097a rev:修改半成品出库页面接口。 2023-04-17 11:22:36 +08:00
640503c693 rev:修改半成品出库分配,设置,强制确认逻辑。 2023-04-17 11:19:16 +08:00
9deeb8b14c rev 更新细节 2023-04-17 08:50:26 +08:00
6f9eb90c58 rev:修改excel中update_id,create_id为数字类型; 2023-04-14 15:19:14 +08:00
1333a16763 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-04-14 14:36:11 +08:00
82334dccf0 rev:修改区域选择 2023-04-14 14:35:22 +08:00
zhangzhiqiang
f540d88857 rev:成品入库分配 2023-04-14 14:29:56 +08:00
d841b8e6c3 opt:优化半成品入库点位锁定与生成任务代码; 2023-04-14 14:26:25 +08:00
797c2e84c9 opt:优化半成品入库点位锁定与生成任务代码; 2023-04-14 14:25:58 +08:00
zhangzhiqiang
e1d40f7884 add:区域查询 2023-04-14 11:35:27 +08:00
zhangzhiqiang
729f61216a rev:成品入库 2023-04-14 11:13:56 +08:00
aa9be88be3 add:增加半成品入库前端页面 2023-04-14 10:26:13 +08:00
16f34a5e3a add:增加半成品入库功能 2023-04-14 10:09:32 +08:00
3214d73799 rev:修改缓存线点位表task_id为task_code 2023-04-11 19:11:18 +08:00
af698f6663 rev:修改一体机设备列表工单数获取。 2023-04-11 16:33:03 +08:00
a41a254545 rev:修改缓存线扫码异常和缓存线异常下发acs接口。 2023-04-11 11:30:20 +08:00
e0f89df220 rev:修改缓存线扫码异常和缓存线异常下发acs接口。 2023-04-11 11:27:06 +08:00
204d771420 rev: 字段修改 2023-04-10 20:02:17 +08:00
zhangzhiqiang
e16a1fd440 rev:一体机工单强制完成 2023-04-10 17:53:39 +08:00
2d0c08748f rev:修改工单状态为枚举判断; 2023-04-10 17:33:42 +08:00
2fa2ec70a3 Merge remote-tracking branch 'origin/master' 2023-04-10 16:00:53 +08:00
f7acb14776 add:增加一体机设备,工单,操作接口; 2023-04-10 16:00:41 +08:00
zhangzhiqiang
9c9f25465e add:添加深坑清洗功能 2023-04-10 10:24:17 +08:00
3dcbb17f75 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-04-07 10:08:12 +08:00
bf502d25cb fix: 修复异常 2023-04-07 10:07:56 +08:00
7b4105fa2e Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-04-06 20:19:25 +08:00
6f84106578 rev 更新同一点位有任务不能请求mes 2023-04-06 20:19:07 +08:00
6202b514c2 fix: 修复任务类型信息,添加acs任务类型 2023-04-06 20:16:41 +08:00
19656f89f0 rev 修改手动创建指令 2023-04-06 19:57:48 +08:00
04357d4129 Merge remote-tracking branch 'origin/master' 2023-04-06 17:03:53 +08:00
a5bb8fcd38 rev:修改acs更新缓存线实时任务id,改为更新编码及相关牵涉代码;
rev:修改扫码异常查询逻辑,扫码异常确认功能增加对接位和准备位选择再下发acs;
rev:修改指令查询中所有指令改为,增加显示字段及筛选条件。
rev:修改任务下发逻辑。
2023-04-06 17:03:44 +08:00
USER-20220102CG\noblelift
72491a513e fix 包装请求参数 2023-04-06 16:25:48 +08:00
ae84fa94bc fix: 修复刻字和包装任务的bug 2023-04-06 16:22:26 +08:00
10f0b26339 rev 更新 2023-04-06 15:17:46 +08:00
USER-20220102CG\noblelift
ef7553bc6f rev acs工单更新 2023-04-06 15:04:38 +08:00
049239cfa8 Merge remote-tracking branch 'origin/master' 2023-04-06 11:19:46 +08:00