diff --git a/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java b/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java index 2749c54..7d4634a 100644 --- a/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java +++ b/youchain-system/src/main/java/com/youchain/RequestData/TransTask.java @@ -13,7 +13,7 @@ public class TransTask { String createTime; @ApiModelProperty(value ="点位",required = true,example = "点位") String pointCode; - @ApiModelProperty(value ="任务类型",required = true,example = "任务类型(Cp_Off_Line成品下线、Fx_Off_Line返修下线、Fx_Back返修载具送回)") + @ApiModelProperty(value ="任务类型",required = true,example = "任务类型(Cp_Off_Up成品上线、Cp_Off_Line成品下线、Fx_Off_Line返修下线)") String taskType; } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java index f8efa83..3939085 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/KMReServiceImpl.java @@ -439,8 +439,9 @@ public class KMReServiceImpl implements KMReService { pointService.freePoint(startPoint); } - //更新状态 - this.updateAgvTaskStatus(agvTask, stock, BizStatus.UP_CONTAINER); + agvTask.setStockCode(stock.getCode()); + agvTask.setStatus(BizStatus.UP_CONTAINER); + agvTaskService.update(agvTask); } @@ -771,7 +772,7 @@ public class KMReServiceImpl implements KMReService { private void updateAgvTaskStatus(AgvTask agvTask, Stock stock, String status) { agvTask.setStockCode(stock.getCode()); agvTask.setStatus(status); - agvTask.setStartTime(new Timestamp(new Date().getTime())); + agvTask.setEndTime(new Timestamp(new Date().getTime())); agvTaskService.update(agvTask); } } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java index 685739d..ea5529b 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java @@ -155,7 +155,7 @@ public class MesServiceImpl implements MesService { public void performTransportTask(TransTask transTask) { switch (transTask.getTaskType()) { case BizStatus.Cp_Off_Up: - moveCpOffUp();//呼叫空货架 + moveCpOffUp(transTask.getPointCode());//呼叫空货架 break; case BizStatus.Cp_Off_Line: moveCpOffLine(transTask);//送满货架 @@ -253,24 +253,19 @@ public class MesServiceImpl implements MesService { return pickDetail; } - private void moveCpOffUp() { - // 尝试从成品入库缓存区查询空车 - List emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKHCQ); + private void moveCpOffUp(String pointCode) { + + // 如果成品入库缓存区没有空车,则从入库区查询 + List emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKQ); if (emptyStockList.isEmpty()) { - // 如果成品入库缓存区没有空车,则从入库区查询 - emptyStockList = stockService.findByKongStock(AreaNameDic.CPRKQ); - if (emptyStockList.isEmpty()) { - throw new BadRequestException("成品入库区没有空车,请稍后再试!"); - } + throw new BadRequestException("成品入库区没有空车,请稍后再试!"); } Stock emptyStock = emptyStockList.get(0); Point srcPoint = emptyStock.getPoint(); - List endPointList = pointService.queryPoints(null, BaseStatus.FREE, BaseStatus.BOX, AreaNameDic.CPXXQ); - if (endPointList.isEmpty()) { - throw new BadRequestException("成品下线区没有空闲点位,请稍后再试!"); - } - Point endPoint = endPointList.get(0); + + Point endPoint = pointService.validatePoint(pointCode);//终点 + // 创建并下发任务 List agvTaskList = agvTaskService.findRepeat(emptyStock.getCode()); if (agvTaskList.isEmpty()) {