From 5ac92579901e62d60af8b5e4d80d1cf4d5bd2602 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 24 Mar 2025 14:29:31 +0800 Subject: [PATCH] no message --- .../basicdata/service/impl/StockServiceImpl.java | 1 - .../businessdata/service/impl/MesServiceImpl.java | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java index e0e1121..8903b38 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java @@ -264,7 +264,6 @@ public class StockServiceImpl implements StockService { if (BaseStatus.USED.equals(stock.getStatus()) || stock.getPoint() != null) { throw new BadRequestException(stock.getCode() + "容器已占用,请更换容器!"); } - } /** 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 e1dedd8..b151312 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 @@ -341,13 +341,10 @@ public class MesServiceImpl implements MesService { return "成品入库区和成品下线缓存区都没有空闲点位,请稍后再试!"; } } - //验证容器是否有任务 - if(!agvTaskService.isStockAvailable(stock.getCode(),BizStatus.Cp_Off_Line,"RACK_MOVE")){ - return transTask.getPointCode() + "点位有任务，请稍后再试!"; - } + // 验证终点是否有任务 - if (!agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.Cp_Off_Line, "RACK_MOVE")) { - return transTask.getPointCode() + "点位有任务，请稍后再试!"; + if (!agvTaskService.isSrcPointAvailable(srcPoint.getCode(), BizStatus.Cp_Off_Line, "RACK_MOVE")) { + return srcPoint.getCode() + "点位有任务，请稍后再试!"; } // 创建Agv任务 @@ -448,8 +445,8 @@ public class MesServiceImpl implements MesService { Point endPoint = endPointList.get(0); - if (!agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.JL_Back, "RACK_MOVE")) { - return endPoint.getCode() + "点位有任务，请稍后再试!"; + if (!agvTaskService.isSrcPointAvailable(srcPoint.getCode(), BizStatus.JL_Back, "RACK_MOVE")) { + return srcPoint.getCode() + "点位有任务，请稍后再试!"; } // 生成任务