Commit Graph

546 Commits

Author SHA1 Message Date
594eede6ce add 取消指令清除phase值 2023-06-09 19:33:51 +08:00
zhangzhiqiang
32fd5187ad rev:调度:深坑物料维护 2023-06-09 12:49:19 +08:00
zhangzhiqiang
911a61a5e0 Merge remote-tracking branch 'origin/master' 2023-06-09 12:48:13 +08:00
756a2daf34 REV 专机设备、缓存线 2023-06-08 18:32:55 +08:00
zhangzhiqiang
75f210ff5d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
2023-06-08 16:45:43 +08:00
zhangzhiqiang
b237b67f6b rev:深坑相关 2023-06-08 16:44:43 +08:00
zhangzhiqiang
2292512476 rev:工单导入/缓存线物料更新 2023-06-08 14:54:25 +08:00
105e5d52e9 rev:深坑设备物料页面报错修改 2023-06-08 09:56:15 +08:00
zhangzhiqiang
4d446905da rev:深坑设备页面修改 2023-06-07 17:42:48 +08:00
zhangzhiqiang
a68d2e323e rev:工单导入/缓存线物料更新 2023-06-07 17:18:45 +08:00
zhangzhiqiang
fedd0a093d Merge remote-tracking branch 'origin/master' 2023-06-07 17:17:15 +08:00
zhangzhiqiang
29012daacd add:添加深坑设备物料修改 2023-06-06 19:33:09 +08:00
jiaoliming
1d52b58d6a fix:盘点完成清除任务号
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-06-06 17:38:15 +08:00
ce9e6e80a8 rev 缓存线反馈 2023-06-06 17:31:00 +08:00
jiaoliming
4d90435ce8 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-06 17:28:18 +08:00
jiaoliming
ee2b98ff01 Revert "fix:"
This reverts commit 4fed94c420.
2023-06-06 17:27:03 +08:00
jiaoliming
4fed94c420 fix: 2023-06-06 17:24:29 +08:00
70e84ce4da add:成品库存 2023-06-06 17:20:33 +08:00
ae846b5fd6 rev: 盘点任务下发 2023-06-05 15:29:52 +08:00
28ae81907d rev: 出入库任务修改 2023-06-05 11:11:47 +08:00
bc5c3361ab rev:盘点下发 2023-06-03 11:44:51 +08:00
8b235687d5 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-03 11:30:46 +08:00
f0bb0cc61a rev:盘点任务下发修改 2023-06-03 11:30:41 +08:00
c744a4cd91 rev:代码合并 2023-06-03 11:16:38 +08:00
fbdc29915d Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-03 11:15:51 +08:00
95b33ac5d4 rev : 出入库下发任务 2023-06-03 11:15:39 +08:00
a5fd09c00c rev:任务下发 2023-06-03 11:14:49 +08:00
88f543c843 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-03 09:56:23 +08:00
1e9ed26ac9 rev:新增任务下发 2023-06-03 09:56:18 +08:00
35dc93da32 rev 缓存线、专机取放货条件更改 2023-06-02 14:35:57 +08:00
zhangzhiqiang
52eb2c1832 Merge remote-tracking branch 'origin/master' 2023-06-02 11:47:53 +08:00
zhangzhiqiang
c2b304c318 add:深坑物料管理 2023-06-02 11:47:13 +08:00
4f50d81d6f add:成品入库取消组盘 2023-06-02 10:47:40 +08:00
ec1d38b7aa rev: 半成品损溢载具物料关系维护 2023-06-01 16:14:38 +08:00
1717c5aaa1 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-01 16:04:50 +08:00
eca2958d47 rev:盘点修改 2023-06-01 16:04:46 +08:00
534476914b rev : 半成品损溢 2023-06-01 15:09:43 +08:00
affbc9a481 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-06-01 15:07:57 +08:00
61fc8c2544 add:新增半成品盘点功能 2023-06-01 15:07:51 +08:00
035edb5c96 add : 半成品损溢 2023-06-01 14:30:16 +08:00
a160d1cd5d rev:拆拼盘修改 2023-06-01 11:28:45 +08:00
8fc96a773d dev:拆拼盘修改 2023-05-31 19:36:19 +08:00
31e9e2c3c0 dev:出库查询库存 2023-05-31 19:14:50 +08:00
a3098348ef Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-31 19:02:22 +08:00
a6266a76f6 dev:拆拼盘修改 2023-05-31 19:02:04 +08:00
4e77ef19a2 rev: 盘点确认 2023-05-31 18:30:26 +08:00
f862349a78 add:成品盘点 2023-05-31 17:22:12 +08:00
zhangzhiqiang
432e5e020d Merge remote-tracking branch 'origin/master' 2023-05-31 11:04:40 +08:00
zhangzhiqiang
efc8ade0ef add:添加设备分配逻辑 rev:修改调度线路文件位置 2023-05-31 11:04:33 +08:00
918bf7964b rev:原材料出入库修改 2023-05-31 09:18:19 +08:00