From 07662e19c6b8953278936f67ff77c5ce56dc9e20 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?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 17 Nov 2025 19:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WcsIntegrationServiceImpl.java             | 6 +++++-
 .../modules/handlingunit/controller/PdaLabelController.java | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 038c79f..3d33251 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -1097,7 +1097,11 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             for (int i = 0; i <groupHUs.size() ; i++) {
                 PalletStationDetailVo saveVo=new PalletStationDetailVo();
                 saveVo.setSku(groupHUs.get(i).getPartNo());
-                saveVo.setMaterialName(groupHUs.get(i).getPartDesc()!=null?groupHUs.get(i).getPartDesc():"无");
+                String partDesc = groupHUs.get(i).getPartDesc();
+                String materialName = (partDesc != null) ?
+                        (partDesc.length() > 70 ? partDesc.substring(0, 70) : partDesc)
+                        : "无";
+                saveVo.setMaterialName(materialName);
                 //物料的长宽不一定是卷材横截面的长宽 所以直接不传
                 saveVo.setLength(new BigDecimal(0));
                 saveVo.setWidth(new BigDecimal(0));
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 db703d5..cafc83a 100644
--- a/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java
+++ b/src/main/java/com/gaotao/modules/handlingunit/controller/PdaLabelController.java
@@ -69,6 +69,9 @@ public class PdaLabelController extends AbstractController {
                 log.warn("标签不存在: site={}, labelCode={}", site, labelCode);
                 return R.error("标签不存在");
             }
+            if(!"Y".equals(handlingUnit.getInStockFlag())){
+                return R.error("标签库存已经被消耗！");
+            }
             
             log.info("查询到标签信息: unitId={}, partNo={}, locationId={}, warehouseId={}, batchNo={}, wdr={}", 
                     handlingUnit.getUnitId(),