|
|
249ca25963
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
Conflicts:
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
|
2022-09-01 13:46:49 +08:00 |
|
|
|
942bde619f
|
update:
apms上报失败msg推送
|
2022-09-01 13:46:36 +08:00 |
|
lgh
|
bd14fe3ed9
|
update:
取消定时修改车辆状态
|
2022-09-01 13:25:00 +08:00 |
|
lgh
|
1ea55bd39a
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-15 11:05:44 +08:00 |
|
lgh
|
dd1a4b448e
|
update:
finishQuantity计算bug修改
|
2022-08-15 11:05:34 +08:00 |
|
|
|
4af20b8551
|
update:
//多用炉因为存在多个识别号且炉子给的DischargeIdentNumber为下油槽后的识别号,所以使用表里记录的任务id根据状态和进炉时间查出正在炉里且先进去的那个
|
2022-08-15 10:44:08 +08:00 |
|
lgh
|
1616215534
|
update:
验证多步骤任务必须有标识卡才能提交
|
2022-08-13 11:04:44 +08:00 |
|
lgh
|
ddf6078774
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-11 16:52:23 +08:00 |
|
lgh
|
f125fac9ee
|
update:
bug修改
|
2022-08-11 16:52:12 +08:00 |
|
|
|
8abbc7193a
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-11 16:43:06 +08:00 |
|
|
|
17c0c1e973
|
update:
新增常见问题汇总curd
|
2022-08-11 16:40:48 +08:00 |
|
lgh
|
c19066792c
|
update:
计算车辆是否冲突起终点bug修改
|
2022-08-06 00:15:42 +08:00 |
|
lgh
|
40f44f57d9
|
update:
bug修改
|
2022-08-05 11:35:05 +08:00 |
|
lgh
|
fbdb10ace7
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-04 18:46:45 +08:00 |
|
|
|
2c186a6ff4
|
update:
去掉定时任务恢复车辆状态,改为任务做完重置车辆状态
|
2022-08-04 18:45:39 +08:00 |
|
lgh
|
05fb4a348a
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
Conflicts:
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
|
2022-08-04 16:01:48 +08:00 |
|
lgh
|
771351b12f
|
update:
bug修改
|
2022-08-04 15:58:16 +08:00 |
|
|
|
d2e37ee2c8
|
update:
bug修改
|
2022-08-04 15:56:09 +08:00 |
|
lgh
|
7000c02653
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-04 15:12:39 +08:00 |
|
lgh
|
2013d5b815
|
update:
bug修改
|
2022-08-04 15:12:28 +08:00 |
|
|
|
e1181e0423
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-04 15:11:30 +08:00 |
|
|
|
5d9ce09137
|
update:
出库bug修改
|
2022-08-04 15:11:22 +08:00 |
|
lgh
|
4c0f84d742
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-04 13:57:33 +08:00 |
|
lgh
|
039f791c97
|
update:
bug修改
|
2022-08-04 13:57:24 +08:00 |
|
|
|
4c731348d4
|
update:
测试rgv避让逻辑
|
2022-08-04 13:56:32 +08:00 |
|
lgh
|
1dd028a202
|
update:
bug修改
|
2022-08-04 11:29:21 +08:00 |
|
lgh
|
7812f248a2
|
update:
订单历史bug修改
|
2022-08-03 21:16:20 +08:00 |
|
|
|
2741a7aa6e
|
update:
测试rgv避让逻辑
|
2022-08-03 18:09:32 +08:00 |
|
|
|
8b488b0f45
|
update:
wcs任务状态记录
|
2022-08-03 18:02:04 +08:00 |
|
|
|
1c0f610e52
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-03 17:52:17 +08:00 |
|
|
|
95f1c30cad
|
update:
避让修改
|
2022-08-03 17:51:57 +08:00 |
|
lgh
|
e3d17d1923
|
任务执行失败缓存区状态回滚
|
2022-08-03 17:13:53 +08:00 |
|
lgh
|
be0ffcae00
|
bug修改
|
2022-08-03 16:39:49 +08:00 |
|
|
|
d595e8985c
|
update:
打印日志信息bug修改
|
2022-08-03 00:26:01 +08:00 |
|
|
|
41227ec816
|
Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd
|
2022-08-03 00:22:37 +08:00 |
|
|
|
373b66aaa3
|
update:
foreach不能remove,使用迭代器
|
2022-08-03 00:22:29 +08:00 |
|
lgh
|
c742686502
|
bug修改
|
2022-08-03 00:18:12 +08:00 |
|
|
|
af9b7a83cb
|
通过标识卡查询订单余量bug修改多步骤任务只计算一次
|
2022-08-02 23:31:48 +08:00 |
|
|
|
3dce5380d8
|
修改入炉前去缓存区时因为异步调用查询到的localtion为null的问题
|
2022-08-02 22:55:06 +08:00 |
|
lgh
|
a4951da905
|
任务历史字段bug修改
|
2022-08-02 22:45:54 +08:00 |
|
|
|
9189d77953
|
加工完成添加任务明细历史记录
|
2022-08-01 21:58:21 +08:00 |
|
|
|
2ee047474a
|
根据生产单号查询检验结果
|
2022-08-01 21:10:11 +08:00 |
|
|
|
f5342d1427
|
根据生产单号查询检验结果list
|
2022-07-28 16:41:05 +08:00 |
|
|
|
a509e54803
|
因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务
|
2022-07-20 08:47:06 +08:00 |
|
|
|
f2de6a3a04
|
bug修改
|
2022-07-19 14:09:51 +08:00 |
|
|
|
1f7332fdbb
|
logger打印信息修改,不打印用户信息
|
2022-07-19 12:24:30 +08:00 |
|
lgh
|
5aa655b2b0
|
任务过程中能源消耗记录优化
|
2022-07-19 10:39:35 +08:00 |
|
lgh
|
189475f09b
|
bug修改
|
2022-07-19 08:42:10 +08:00 |
|
lgh
|
f555907877
|
最后一步加工炉完成后直接出库到一号液压台
|
2022-07-18 12:26:23 +08:00 |
|
lgh
|
c44edba722
|
当完成数量等于总数量且完成重量等于总重量时订单状态置为完成
|
2022-07-18 11:22:50 +08:00 |
|
