Commit Graph

229 Commits

Author SHA1 Message Date
LGH
ac476e936e Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-12-27 18:04:03 +08:00
LGH
6259a0237e update: 2022-12-27 18:03:59 +08:00
LGH
b0540ce4dc update: 2022-12-27 18:02:13 +08:00
lgh
395817f10e update: 2022-12-27 18:01:05 +08:00
lgh
21a4cfab23 update:
监听到加工炉完成加工后就结束当前工艺,防止开始新的工艺时上报出错
2022-12-02 15:42:02 +08:00
lgh
63d251325f update:
安全距离3.8米;
停止接收任务启用;
订单作废;
修改任务状态提交apms;
2022-11-28 17:02:29 +08:00
LGH
a002354d49 update:
出库液压台在线且高位则选为出库台
2022-11-24 09:09:38 +08:00
lgh
7e9d8f5e64 update:
任务明细非空判定,
手动进炉的任务生成炉号
2022-11-24 08:41:38 +08:00
LGH
bcff5830f4 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/service/impl/CurrTaskServiceImpl.java
	6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
2022-11-21 15:59:56 +08:00
LGH
75471b7166 update:
炉号生成规则修改;
新增未成功报工列表接口;
新增报工接口;
2022-11-21 15:55:19 +08:00
LGH
ec7f364ccf update:
炉号生成规则修改;
新增未成功报工列表接口;
新增报工接口;
2022-11-21 15:54:43 +08:00
lgh
5582a6929c update:
任务列表信息缺失补全
2022-11-21 15:49:07 +08:00
lgh
74b42527c6 update:
bug修改,float转double精度丢失
2022-11-21 09:16:26 +08:00
LGH
b407f99872 update:
上报apms炉号修改
2022-11-18 10:43:09 +08:00
LGH
292c511c22 update:
上报apms炉号修改
2022-11-18 10:37:06 +08:00
LGH
59921c28ca update:
上报apms炉号
2022-11-18 10:15:35 +08:00
LGH
5eed777f0a update:
上报apms炉号
2022-11-18 10:12:54 +08:00
LGH
592d27b858 update:
上报apms炉号
2022-11-18 10:09:47 +08:00
LGH
59f008f19e Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-11-18 09:06:34 +08:00
LGH
3ecf06ae6a update:
能源消耗结构修改
2022-11-18 09:05:14 +08:00
lgh
605cdb5aa0 Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-11-10 10:30:15 +08:00
lgh
647e3f5761 update:
bug修改
2022-11-10 10:30:00 +08:00
LGH
85299bb26a update:
编码生成redis设置key有效期为当天,次日凌晨失效重新开始计数
2022-11-09 13:58:23 +08:00
LGH
1a6c19bf14 update:
工艺号显示
2022-11-04 15:36:06 +08:00
LGH
7cfa7168e1 update:
生成炉号
2022-11-03 16:18:44 +08:00
LGH
d5464eed6c update:
能源消耗比较
生成炉号
2022-11-03 16:14:01 +08:00
LGH
9d8b6c065f Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-10-26 15:25:09 +08:00
LGH
e6995b99a3 update:
执行任务按钮校验任务状态防止重复发起
2022-10-26 15:24:07 +08:00
lgh
ef0ba77715 update:
删除bug修改
2022-09-26 14:24:10 +08:00
lgh
2def9c889f update:
安全距离修改;
缓存任务进炉前校验任务状态;
2022-09-21 10:56:32 +08:00
LGH
17f5ddbfa0 Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-09-20 09:58:08 +08:00
LGH
6ed7a735ed update:
订单列表增加筛选项
2022-09-20 09:57:56 +08:00
lgh
f359470fc4 update:
bug修改
2022-09-16 15:26:32 +08:00
LGH
5e54011371 Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd 2022-09-09 23:17:39 +08:00
LGH
8643ca11d7 update:
currTask列表总览及操作方式修改-bug修改
2022-09-09 23:17:34 +08:00
lgh
5711a2acf6 update:
bug修改
2022-09-09 23:16:45 +08:00
LGH
cb0be1cbbf update:
currTask列表总览及操作方式修改-bug修改
2022-09-09 22:04:20 +08:00
LGH
9a7170d9e9 update:
currTask列表总览及操作方式修改-bug修改
2022-09-09 21:56:48 +08:00
LGH
18590dafb9 update:
currTask列表总览及操作方式修改
2022-09-09 16:46:26 +08:00
LGH
d107699d2c update:
currTask列表修改
2022-09-05 17:01:56 +08:00
LGH
d49759efdf update:
currTask列表修改-bug修改
2022-09-01 15:22:17 +08:00
LGH
412dbd04d4 update:
currTask列表修改
2022-09-01 14:53:12 +08:00
LGH
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
LGH
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
LGH
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