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

Compare commits

base: mt-ck:52dfdc9c7fdb4c5d9ab3db0bdce6f6a9b16e6892
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs
..
compare: mt-ck:3015a43a5572f27f079f7e3281a9998352d7d1f7
Branches Tags
mt-ck:master
mt-ck:mt-qj-wms
mt-ck:mt-qj-wcs

No commits in common. "52dfdc9c7fdb4c5d9ab3db0bdce6f6a9b16e6892" and "3015a43a5572f27f079f7e3281a9998352d7d1f7" have entirely different histories.
52dfdc9c7f ... 3015a43a55

5 changed files with 13 additions and 39 deletions
Show Stats Expand all files Collapse all files

1
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java
View File

@ -2,7 +2,6 @@ package com.mt.wms.empty.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mt.wms.basic.service.KilnInfoService; import com.mt.wms.basic.service.KilnInfoService;
import com.mt.wms.basic.vo.KilnInfoVo; import com.mt.wms.basic.vo.KilnInfoVo;
import com.mt.wms.core.base.BaseController; import com.mt.wms.core.base.BaseController;

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

@ -287,7 +287,7 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
); );
e.setCustomers(customers); e.setCustomers(customers);
e.setKilnName(e.getTargetPosition()); e.setKilnName(e.getTargetPosition());
//e.setLocationName(locationServiceBiz.getById(e.getLocationId()).getLocationName()); e.setLocationName(locationServiceBiz.getById(e.getLocationId()).getLocationName());
}); });
return successful(pageVo); return successful(pageVo);
} }

29
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
View File

@ -114,7 +114,6 @@ public class AsynRunTaskService extends BaseService {
runTaskServiceBiz.updateById(runTask); runTaskServiceBiz.updateById(runTask);
//更新currTask表状态 //更新currTask表状态
currTask.setIsIn(1); currTask.setIsIn(1);
currTask.setStatus(1);
currTask.setRunTaskId(runTask.getId()); currTask.setRunTaskId(runTask.getId());
currTask.setUpdateTime(LocalDateTime.now()); currTask.setUpdateTime(LocalDateTime.now());
currTask.setBeginTime(LocalDateTime.now()); currTask.setBeginTime(LocalDateTime.now());
@ -133,7 +132,6 @@ public class AsynRunTaskService extends BaseService {
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId)); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId));
CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId());
firstCurrTask.setIsIn(2); firstCurrTask.setIsIn(2);
firstCurrTask.setStatus(2);
currTaskServiceBiz.updateById(firstCurrTask); currTaskServiceBiz.updateById(firstCurrTask);
apmsEndProcess(firstCurrTask); apmsEndProcess(firstCurrTask);
//再上报第二步开始处理 //再上报第二步开始处理
@ -145,7 +143,6 @@ public class AsynRunTaskService extends BaseService {
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId)); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId));
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId());
secondCurrTask.setIsIn(2); secondCurrTask.setIsIn(2);
secondCurrTask.setStatus(2);
currTaskServiceBiz.updateById(secondCurrTask); currTaskServiceBiz.updateById(secondCurrTask);
apmsEndProcess(secondCurrTask); apmsEndProcess(secondCurrTask);
//再上报第三步开始处理 //再上报第三步开始处理
@ -210,7 +207,6 @@ public class AsynRunTaskService extends BaseService {
locationServiceBiz.updateById(location); locationServiceBiz.updateById(location);
//更新currTask表状态 //更新currTask表状态
currTask.setIsIn(1); currTask.setIsIn(1);
currTask.setStatus(1);
currTask.setRunTaskId(runTask.getId()); currTask.setRunTaskId(runTask.getId());
currTask.setUpdateTime(LocalDateTime.now()); currTask.setUpdateTime(LocalDateTime.now());
currTask.setBeginTime(LocalDateTime.now()); currTask.setBeginTime(LocalDateTime.now());
@ -322,13 +318,11 @@ public class AsynRunTaskService extends BaseService {
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId)); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId));
CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId());
firstCurrTask.setIsIn(2); firstCurrTask.setIsIn(2);
firstCurrTask.setStatus(2);
currTaskServiceBiz.updateById(firstCurrTask); currTaskServiceBiz.updateById(firstCurrTask);
}else { }else {
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId)); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId));
CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getTTaskId()); CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getThTaskId());
secondCurrTask.setIsIn(2); secondCurrTask.setIsIn(2);
secondCurrTask.setStatus(2);
currTaskServiceBiz.updateById(secondCurrTask); currTaskServiceBiz.updateById(secondCurrTask);
} }
} }
@ -393,9 +387,7 @@ public class AsynRunTaskService extends BaseService {
currTask.setIsOut(2); currTask.setIsOut(2);
currTask.setUpdateTime(LocalDateTime.now()); currTask.setUpdateTime(LocalDateTime.now());
currTask.setStatus(2); currTask.setStatus(2);
currTask.setIsIn(2); currTask.setEndTime(LocalDateTime.now());
currTask.setUpdateTime(LocalDateTime.now());
logger.info("修改currTask任务状态");
currTaskServiceBiz.updateById(currTask); currTaskServiceBiz.updateById(currTask);
//更新in_stock_info表 //更新in_stock_info表
inStockInfo.setStatus(2); inStockInfo.setStatus(2);
@ -405,17 +397,12 @@ public class AsynRunTaskService extends BaseService {
vehicle.setStatus(0); vehicle.setStatus(0);
vehicleInfoServiceBiz.updateById(vehicle); vehicleInfoServiceBiz.updateById(vehicle);
//任务为非自动任务上报apms-end-finish //任务为非自动任务上报apms-end-finish
if (currTask.getIsAuto()==0) { if (currTask.getIsOut()==0) {
//上报apms完成处理 //上报apms完成处理
logger.info("此任务为单步骤任务，任务结束，上报apms-end-finish"); logger.info("此任务为单步骤任务，任务结束，上报apms-end-finish");
apmsEndProcess(currTask); apmsEndProcess(currTask);
apmsFinishProcess(currTask); apmsFinishProcess(currTask);
} else { } else {
int firstSetp = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.F_TASK_ID, currTaskId));
if (firstSetp>0){
//当前任务为自动任务的第一步
apmsEndProcess(currTask);
}
int secondSetp = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId)); int secondSetp = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId));
if (secondSetp>0){ if (secondSetp>0){
AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId)); AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.T_TASK_ID, currTaskId));
@ -425,9 +412,6 @@ public class AsynRunTaskService extends BaseService {
apmsEndProcess(currTask); apmsEndProcess(currTask);
//再上报apms-finishProcess //再上报apms-finishProcess
apmsFinishProcess(currTask); apmsFinishProcess(currTask);
}else {
//当前任务为三步中的第二步
apmsEndProcess(currTask);
} }
} }
int threeSetp = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId)); int threeSetp = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.TH_TASK_ID, currTaskId));
@ -438,7 +422,9 @@ public class AsynRunTaskService extends BaseService {
//再上报apms-finishProcess //再上报apms-finishProcess
apmsFinishProcess(currTask); apmsFinishProcess(currTask);
} }
logger.info("此任务为为自动任务里的第一步或第二步，任务结束，上报apms-end-finish");
//为自动任务的非第三步
apmsEndProcess(currTask);
} }
} else { } else {
runTask.setStatus(3); runTask.setStatus(3);
@ -534,7 +520,6 @@ public class AsynRunTaskService extends BaseService {
//更新库位状态 //更新库位状态
location.setStatus(0); location.setStatus(0);
locationServiceBiz.updateById(location); locationServiceBiz.updateById(location);
//更新车辆状态 //更新车辆状态
VehicleInfo vehicleInfo = vehicleInfoServiceBiz.getById(vehicleId); VehicleInfo vehicleInfo = vehicleInfoServiceBiz.getById(vehicleId);
vehicleInfo.setStatus(0); vehicleInfo.setStatus(0);
@ -1268,7 +1253,7 @@ public class AsynRunTaskService extends BaseService {
* @return 单步骤任务true，多步骤任务第一步true,其他false * @return 单步骤任务true，多步骤任务第一步true,其他false
*/ */
public Boolean isFirstTask(CurrTask currTask){ public Boolean isFirstTask(CurrTask currTask){
if (currTask.getIsAuto()==1){ if (currTask.getIsOut()==1){
int count = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.F_TASK_ID, currTask.getId())); int count = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.F_TASK_ID, currTask.getId()));
return count>0; return count>0;
}else { }else {

5
6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
View File

@ -221,9 +221,9 @@ public class RunTaskUtils {
Long thTaskId = autoExeTask.getThTaskId(); Long thTaskId = autoExeTask.getThTaskId();
CurrTask currTaskThree = currTaskServiceBiz.getById(thTaskId); CurrTask currTaskThree = currTaskServiceBiz.getById(thTaskId);
try { try {
logger.info("自动任务第二步:"+currTask.getTaskCode()+"已执行完成。开始执行第三步任务:"+currTaskThree.getId()); logger.info("自动任务第二步:"+currTask.getTaskCode()+"已执行完成。开始执行第三步任务:"+currTaskThree);
// 2022/2/27 websocket推送到页面显示 // 2022/2/27 websocket推送到页面显示
webSocketServer.sendtoAll("自动任务第二步:"+currTask.getTaskCode()+"已执行完成。开始执行第三步任务:"+currTaskThree.getId()); webSocketServer.sendtoAll("自动任务第二步:"+currTask.getTaskCode()+"已执行完成。开始执行第三步任务:"+currTaskThree);
return runTaskForInKiln(thTaskId); return runTaskForInKiln(thTaskId);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
@ -231,6 +231,7 @@ public class RunTaskUtils {
} }
} }
} }
} }
//查询缓存区库位是否已满 //查询缓存区库位是否已满

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

@ -74,20 +74,9 @@ public class ScheduledTask extends BaseService {
private CurrTaskDetServiceBiz currTaskDetServiceBiz; private CurrTaskDetServiceBiz currTaskDetServiceBiz;
@Resource @Resource
private OrderInfoServiceBiz orderInfoServiceBiz; private OrderInfoServiceBiz orderInfoServiceBiz;
@Resource
private AutoExeTaskServiceBiz autoExeTaskServiceBiz;
//@Scheduled(fixedDelay = 1000*20) //@Scheduled(fixedDelay = 1000*20)
@Test
public void test() throws IOException { public void test() throws IOException {
CurrTask currTask = currTaskServiceBiz.getById(342);
if (currTask.getIsOut()==1){
int count = autoExeTaskServiceBiz.count(new QueryWrapper<AutoExeTask>().eq(AutoExeTask.F_TASK_ID, currTask.getId()));
System.out.println(count>0);;
}else {
System.out.println(true);
}
} }
//@Scheduled(fixedDelay = 1000*60) //@Scheduled(fixedDelay = 1000*60)
public void testWebsocket() throws IOException { public void testWebsocket() throws IOException {
@ -228,7 +217,7 @@ public class ScheduledTask extends BaseService {
asynRunTaskService.asynEndRecordConsume(currTask.getId(),kilnId); asynRunTaskService.asynEndRecordConsume(currTask.getId(),kilnId);
logger.info(kilnInfo.getCode()+"炉子中的任务："+currTask.getId()+"已加工结束，记录加工结束能源消耗值"); logger.info(kilnInfo.getCode()+"炉子中的任务："+currTask.getId()+"已加工结束，记录加工结束能源消耗值");
//更新加工单工艺结束时间,只更新一次，因为可能因为不满住出炉条件而进入到下一次定时任务 //更新加工单工艺结束时间,只更新一次，因为可能因为不满住出炉条件而进入到下一次定时任务
if (String.valueOf(currTask.getEndTime()).equals("null")){ if (StringUtils.isBlank(currTask.getEndTime().toString())){
currTask.setEndTime(LocalDateTime.now()); currTask.setEndTime(LocalDateTime.now());
currTaskServiceBiz.updateById(currTask); currTaskServiceBiz.updateById(currTask);
} }
@ -499,7 +488,7 @@ public class ScheduledTask extends BaseService {
} }
//查询炉子是否allowIn //查询炉子是否allowIn
Boolean kilnAllowIn = kilnAllowIn(kilnInfo.getId()); Boolean kilnAllowIn = kilnAllowIn(kilnInfo.getId());
if (kilnReadyIn&&kilnAllowIn){ if (kilnReadyIn||kilnAllowIn){
//缓存区是否有目标位置为工业炉的待加工任务 //缓存区是否有目标位置为工业炉的待加工任务
List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>() List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>()
.eq(InStockInfo.TYPE, 1) .eq(InStockInfo.TYPE, 1)