修改记录

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));

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(),