From d2e37ee2c8bfe9662a69da2039a6602396920495 Mon Sep 17 00:00:00 2001 From: LGH <1746689524@qq.com> Date: Thu, 4 Aug 2022 15:56:09 +0800 Subject: [PATCH] =?UTF-8?q?update:=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/wms/empty/task/AsynRunTaskService.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java index f04c341..b71884e 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java @@ -178,7 +178,8 @@ public class AsynRunTaskService extends BaseService { Location location = locationServiceBiz.getById(inStockInfo.getLocationId()); Long currTaskId = inStockInfo.getTaskId(); CurrTask currTask = currTaskServiceBiz.getById(currTaskId); - VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId);List currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper().eq(CurrTaskDet.CURR_TASK_ID, currTask)); + VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId); + List currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper().eq(CurrTaskDet.CURR_TASK_ID, currTask)); //检查车辆是否冲突，冲突则避让 rgvStatus(vehicleId, currTask,location.getCode(),currTask.getTargetPosition()); //新建一条执行任务的关系表存放任务执行信息 @@ -234,23 +235,24 @@ public class AsynRunTaskService extends BaseService { } else { int secondSetp = autoExeTaskServiceBiz.count(new QueryWrapper().eq(AutoExeTask.T_TASK_ID, currTaskId)); if (secondSetp>0){ + //从缓存区到加工炉的任务,其上一步已经报告了apmsend //当前任务为自动任务里的第二步，先上报第一步的apms-endProcess - AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper().eq(AutoExeTask.T_TASK_ID, currTaskId)); - CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); - firstCurrTask.setIsIn(2); - currTaskServiceBiz.updateById(firstCurrTask); - apmsEndProcess(firstCurrTask); + //AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper().eq(AutoExeTask.T_TASK_ID, currTaskId)); + //CurrTask firstCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); + //firstCurrTask.setIsIn(2); + //currTaskServiceBiz.updateById(firstCurrTask); + //apmsEndProcess(firstCurrTask); //再上报第二步开始处理 apmsStartProcess(currTask); } int threeSetp = autoExeTaskServiceBiz.count(new QueryWrapper().eq(AutoExeTask.TH_TASK_ID, currTaskId)); if (threeSetp>0){ //当前任务为自动任务里的第三步，先上报第二步的apms处理endProcess - AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper().eq(AutoExeTask.TH_TASK_ID, currTaskId)); - CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getFTaskId()); - secondCurrTask.setIsIn(2); - currTaskServiceBiz.updateById(secondCurrTask); - apmsEndProcess(secondCurrTask); + //AutoExeTask autoExeTask = autoExeTaskServiceBiz.getOne(new QueryWrapper().eq(AutoExeTask.TH_TASK_ID, currTaskId)); + //CurrTask secondCurrTask = currTaskServiceBiz.getById(autoExeTask.getTTaskId()); + //secondCurrTask.setIsIn(2); + //currTaskServiceBiz.updateById(secondCurrTask); + //apmsEndProcess(secondCurrTask); //再上报第三步开始处理 apmsStartProcess(currTask); }