mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

Browse Source 
 Conflicts:
	6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
This commit is contained in:
李广豪 2022-09-01 13:46:49 +08:00
commit 249ca25963
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
View File

@ -88,7 +88,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
//如果是多步骤任务且不是第一步,移除对象
if (byId.getIsAuto()==1){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
if (!byId.getId().equals(autoExeTask.getFTaskId())){
if (!byId.getTaskId().equals(autoExeTask.getFTaskId())){
iterator.remove();
}
}

15
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
View File

@ -134,7 +134,7 @@ public class ScheduledTask extends BaseService {
/**
* 正在加工的加工任务详情
*/
//Scheduled(fixedDelay = 1000*60)
@Scheduled(fixedDelay = 1000*60)
public void screen() throws IOException {
//查询出正在进炉加工的curr_task,查询对应炉号是否Working,查询计划时间，剩余时间，查询标识卡详情
List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>()
@ -199,7 +199,7 @@ public class ScheduledTask extends BaseService {
/**
* 查询加工完成的工业炉
*/
//@Scheduled(fixedDelay = 1000*30)
@Scheduled(fixedDelay = 1000*30)
public void taskForStockToKiln() throws IOException {
//两辆车是否都空闲，只有两辆车都空闲才被允许做任务
List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS, 0));
@ -250,7 +250,7 @@ public class ScheduledTask extends BaseService {
}
//查询出正在加工的工业炉，遍历，根据采集频率的不同，采集高频数据能源消耗。暂定30秒
//@Scheduled(fixedDelay = 1000*30)
@Scheduled(fixedDelay = 1000*30)
public void getFastValue(){
//加工炉列表
List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list(new QueryWrapper<KilnInfo>().in(KilnInfo.TYPE,1,3));
@ -366,7 +366,7 @@ public class ScheduledTask extends BaseService {
}
//查询出正在加工的工业炉，遍历，根据采集频率的不同，采集低频数据能源消耗。暂定3分钟一次
//@Scheduled(fixedDelay = 1000*60*3)
@Scheduled(fixedDelay = 1000*60*3)
public void getSlowValue(){
List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list();
for (KilnInfo kilnInfo:kilnInfoList
@ -538,7 +538,7 @@ public class ScheduledTask extends BaseService {
//遍历工业炉，空工业炉查询缓存区是否有等待加工的任务，
//待加工任务存在且没有状态为正在进炉的情况下，按照先进先出的规则选择待加工任务呼叫车辆进炉
//@Scheduled(fixedDelay = 1000*60)
@Scheduled(fixedDelay = 1000*60)
public void runTaskForEmptyKiln() throws IOException {
List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list(new QueryWrapper<KilnInfo>()
.eq(KilnInfo.VALID, 1).eq(KilnInfo.STATUS, 0).orderByAsc(KilnInfo.TYPE));
@ -608,7 +608,7 @@ public class ScheduledTask extends BaseService {
}
//遍历正在工作炉子的报警变量，记录报警
//@Scheduled(fixedDelay = 1000*60)
@Scheduled(fixedDelay = 1000*60)
public void listenKilnAlarm(){
List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list();
for (KilnInfo kilnInfo:kilnInfoList
@ -680,8 +680,7 @@ public class ScheduledTask extends BaseService {
}
}
//监听车辆是否在线,定时恢复车辆状态会导致避让时等待时间过久,再次发起任务,造成重复发起
//@Scheduled(fixedDelay = 1000*60)
//监听车辆是否在线,定时恢复车辆状态会导致避让时等待时间过久,再次发起任务,造成重复发起，废弃
public void listenVehicleOnline() throws IOException {
List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS,1));
for (VehicleInfo vehicleInfo:vehicleInfoList

5
6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
View File

@ -138,4 +138,9 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
*/
@TableField("auto_exe_task_id")
private Long autoExeTaskId;
/**
* currid
*/
@TableField("auto_exe_task_id")
private Long taskId;
}