From 7a131b0ac3f2b627003111af3b1b572cb0313268 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 17 Mar 2025 15:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=AE=B9=E5=99=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98=E5=8C=BA=EF=BC=8C?= =?UTF-8?q?=E6=88=90=E5=93=81=E4=B8=8A=E7=BA=BFBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youchain/businessdata/service/impl/KMReServiceImpl.java | 2 +- .../youchain/businessdata/service/impl/MesServiceImpl.java | 3 +++ .../main/java/com/youchain/modules/quartz/task/cpUpTask.java | 2 ++ .../src/main/java/com/youchain/utils/AreaNameDic.java | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) 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 e0f9729..8d5cf52 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 @@ -255,7 +255,7 @@ public class KMReServiceImpl implements KMReService { private List getAreaNames(String areaCode) { switch (areaCode) { case "CPSXX-CX": - return Arrays.asList(AreaNameDic.CPRKQ, AreaNameDic.CPXXQ); + return Arrays.asList(AreaNameDic.CPRKQ, AreaNameDic.CPXXQ, AreaNameDic.CPYCHCQ); case "DJBY-CX": return Arrays.asList(AreaNameDic.DJFBCQ, AreaNameDic.DJJLQ); default: 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 0443b0d..b92a488 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 @@ -278,6 +278,9 @@ public class MesServiceImpl implements MesService { //创建Agv任务 AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.Cp_Off_Up, emptyStock, srcPoint.getCode(), endPoint.getCode(), "RACK_MOVE"); + //容器占用 + stockService.usedStock(emptyStock, emptyStock.getPoint(), BaseStatus.USED); + // 更新点位状态 pointService.usedPoint(endPoint); diff --git a/youchain-system/src/main/java/com/youchain/modules/quartz/task/cpUpTask.java b/youchain-system/src/main/java/com/youchain/modules/quartz/task/cpUpTask.java index c7f8f1c..9883d00 100644 --- a/youchain-system/src/main/java/com/youchain/modules/quartz/task/cpUpTask.java +++ b/youchain-system/src/main/java/com/youchain/modules/quartz/task/cpUpTask.java @@ -80,5 +80,7 @@ public class cpUpTask { agvTask.setStartSlotCode(stock.getPoint() == null ? null : stock.getPoint().getCode()); // 更新AGV任务 agvTaskService.update(agvTask); + //容器占用 + stockService.usedStock(stock, stock.getPoint(), BaseStatus.USED); } } diff --git a/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java b/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java index b84ad8d..a1750b4 100644 --- a/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java +++ b/youchain-system/src/main/java/com/youchain/utils/AreaNameDic.java @@ -88,4 +88,9 @@ public interface AreaNameDic { */ String DJFKQ = "大件返空区"; + /** + * 成品异常缓存区 + */ + String CPYCHCQ = "成品异常缓存区"; + }