From b91f6505c137f82489fcc6ab94457ce0a063e1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Fri, 26 Dec 2025 17:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A0=A1=E5=87=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E5=BF=85=E9=A1=BB=E5=9C=A8=E6=A0=88=E6=9D=BF?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LabelCalibrationServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/impl/LabelCalibrationServiceImpl.java b/src/main/java/com/gaotao/modules/handlingunit/service/impl/LabelCalibrationServiceImpl.java index 1521031..1dc9506 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/service/impl/LabelCalibrationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/handlingunit/service/impl/LabelCalibrationServiceImpl.java @@ -2,6 +2,7 @@ package com.gaotao.modules.handlingunit.service.impl; import com.gaotao.modules.api.entity.IfsInventoryPartInStock; import com.gaotao.modules.api.service.IfsApiService; +import com.gaotao.modules.automatedWarehouse.mapper.WcsIntegrationMapper; import com.gaotao.modules.handlingunit.dao.HandlingUnitMapper; import com.gaotao.modules.handlingunit.dao.LabelCalibrationMapper; import com.gaotao.modules.handlingunit.entity.HandlingUnit; @@ -31,6 +32,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -75,7 +77,8 @@ public class LabelCalibrationServiceImpl implements LabelCalibrationService { @Autowired private LabelCalibrationMapper labelCalibrationMapper; - + @Autowired + private WcsIntegrationMapper wcsIntegrationMapper; /** * @Description 查询标签校准信息 - rqrq */ @@ -168,7 +171,11 @@ public class LabelCalibrationServiceImpl implements LabelCalibrationService { if (originalHu == null) { throw new RuntimeException("标签不存在：" + unitId); } - + Map existingPalletInfo = wcsIntegrationMapper.findPalletByLabel(site, unitId); + if (existingPalletInfo != null) { + String existingPalletId = (String) existingPalletInfo.get("palletId"); + throw new RuntimeException("标签在栈板["+existingPalletId+"]上,请先扫出"); + } // 检查标签是否在库 - rqrq if (!"Y".equals(originalHu.getInStockFlag())) { throw new RuntimeException("标签库存已被消耗");