From 6fd29d5a9c708c743de8f0d177e37243aa910916 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 18 Dec 2025 16:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/handlingunit/controller/PdaLabelController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java index a925289..425f795 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java +++ b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java @@ -83,7 +83,7 @@ public class PdaLabelController extends AbstractController { log.warn("标签不存在: site={}, labelCode={}", site, labelCode); return R.error("标签不存在"); } - if(!"Y".equals(handlingUnit.getInStockFlag())){ + if(!"Y".equals(handlingUnit.getInStockFlag()) && !"X".equals(handlingUnit.getInStockFlag())){ return R.error("标签库存已经被消耗！"); } @@ -197,7 +197,7 @@ public class PdaLabelController extends AbstractController { } // 3. 验证库存状态 - if (!"Y".equals(originalUnit.getInStockFlag())) { + if (!"Y".equals(originalUnit.getInStockFlag()) && !"X".equals(originalUnit.getInStockFlag())) { throw new XJException("该标签库存已被消耗，不能拆分"); } @@ -217,7 +217,7 @@ public class PdaLabelController extends AbstractController { newUnit.setUnitId(newUnitId); newUnit.setQty(splitQty); // 新标签数量 newUnit.setSourceType("SPLIT"); // 来源类型：拆分 - newUnit.setSourceRef(unitId); // 原标签编码 + newUnit.setParentUnitId(unitId); // 原标签编码 newUnit.setCreatedDate(new Date()); newUnit.setCreatedBy(operatorName); newUnit.setModifiedDate(new Date());