From 5711a2acf6a20fe1ac73d12023c0b109013c8a6a Mon Sep 17 00:00:00 2001 From: lgh Date: Fri, 9 Sep 2022 23:16:45 +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 --- .../wms/empty/service/impl/CurrTaskServiceImpl.java | 7 +++++-- .../com/mt/wms/empty/task/AsynRunTaskService.java | 3 ++- .../src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java | 11 ++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java index 26ed88e..bb9d17b 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java @@ -186,8 +186,11 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService }else if (currTask1.getIsCache()==1){ nowStep=currTask.getLocationName(); } - if (currTaskInfoVo.getInStockInfoVoList().size()>0){ - nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName(); + if (currTaskInfoVo.getInStockInfoVoList()!=null){ + if (currTaskInfoVo.getCurrTaskVoList().size()>0){ + + nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName(); + } } allStep=allStep.concat("->").concat(currTask1.getTargetPosition()); } 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 9fe913d..9e228da 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 @@ -286,6 +286,7 @@ public class AsynRunTaskService extends BaseService { CurrTask currTask = currTaskServiceBiz.getById(currTaskId); //Location location = locationServiceBiz.getById(currTask.getLocationId()); VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId); + KilnInfo kilnInfo = kilnInfoServiceBiz.getById(currTask.getKilnId()); //检查车辆是否冲突，冲突则避让 rgvStatus(vehicleId, currTask,currTask.getStartPosition(),location.getCode()); //新建一条执行任务的关系表存放任务执行信息,终点为缓存区空闲库位 @@ -305,7 +306,7 @@ public class AsynRunTaskService extends BaseService { inStockInfo.setTaskId(currTask.getId()); inStockInfo.setTaskCode(currTask.getTaskCode()); inStockInfo.setKilnId(currTask.getKilnId()); - inStockInfo.setKilnName(currTask.getKilnName()); + inStockInfo.setKilnName(kilnInfo.getKilnName()); inStockInfo.setLocationId(location.getId()); inStockInfo.setLocationName(location.getLocationNameAlias()); inStockInfo.setType(1); diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java index 34b77b7..5dd7841 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java @@ -135,17 +135,22 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo { /** * 是否自动执行： 0手动，1自动，如果是自动任务这里要监控进出和到缓存区的调度任务 */ - @TableField("is_auto") + @ApiModelProperty("is_auto") private Integer isAuto; /** * 任务流程ID，关联流程表：t_auto_exe_task */ - @TableField("auto_exe_task_id") + @ApiModelProperty("auto_exe_task_id") private Long autoExeTaskId; /** * currid */ - @TableField("auto_exe_task_id") + @ApiModelProperty("auto_exe_task_id") private Long taskId; + /** + * 工艺id + */ + @ApiModelProperty("auto_exe_task_id") + private Long craftCodeId; }