From 3ff9e2ccdad0878f39d16f674e7b0e2bb3fe119c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 26 Jun 2025 17:45:42 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=86=E9=85=8D=E8=A7=84=E5=88=99=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StructattrServiceImpl.java              | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
index 161c17e..0076684 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
@@ -33,7 +33,6 @@ import org.nl.wms.basedata_manage.service.dto.StrategyStructMaterialVO;
 import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
 import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService;
 import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
-import org.nl.wms.decision_manage.service.sectStrategy.decisionChar.DecisionerChain;
 import org.nl.wms.decision_manage.service.strategyConfig.decisioner.Decisioner;
 import org.nl.wms.sch_manage.enums.StatusEnum;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
@@ -41,6 +40,7 @@ import org.nl.wms.warehouse_management.service.dao.IOStorInv;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -327,6 +327,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
 
     @Override
     public List<StrategyStructMaterialVO> outBoundSectDiv(StrategyStructParam param) {
+        //只校验仓库，库区
+        Assert.noNullElements(new Object[]{param.getStor_code(),param.getSect_code()},"请求参数不能为空");
         StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper<StSectStrategy>()
                 .eq(StSectStrategy::getSect_code, param.getSect_code())
                 .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("入库")));
@@ -338,7 +340,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
             log.info("执行出入库规格:"+decisioner.strategyConfig.getStrategy_name());
             list = decisioner.handler(list, param);
             if (CollectionUtils.isEmpty(list)){
-                throw new BadRequestException("当前策略"+decisioner.strategyConfig.getStrategy_name()+"无可用货位,分配前数量:"+transfers.size());
+                throw new BadRequestException("当前策略"+decisioner.strategyConfig.getStrategy_name()+"无可用货位,分配前数量:"+list.size());
             }
         }
         return list;
@@ -346,6 +348,9 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
 
     @Override
     public List<Structattr> inBoundSectDiv(StrategyStructParam param) {
+        //批号，单据暂时不校验，具体业务具体校验
+        Assert.noNullElements(new Object[]{param.getQty(),param.getMaterial_code(),param.getStor_code(),param.getSect_code()},"请求参数不能为空");
+
         StSectStrategy one = iStSectStrategyService.getOne(new LambdaQueryWrapper<StSectStrategy>()
                 .eq(StSectStrategy::getSect_code, param.getSect_code())
                 .eq(StSectStrategy::getStrategy_type, StatusEnum.STRATEGY_TYPE.code("入库")));