add:增加二楼特殊托盘入库逻辑;

opt:优化搜索相关

nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml

@@ -93,7 +93,10 @@
                 (attr.struct_code LIKE #{param.struct_code} or
                 attr.struct_name LIKE #{param.struct_code} )
             </if>
-
+            <if test="param.storagevehicle_code != null and param.storagevehicle_code != ''">
+                AND
+                attr.storagevehicle_code LIKE #{param.storagevehicle_code}
+            </if>
             <if test="param.material_code != null and param.material_code != ''">
                 AND
                 (mater.material_code LIKE #{param.material_code} or

nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java

@@ -355,10 +355,27 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         if (one == null) {
             throw new BadRequestException("当前库区" + param.getSect_code() + "未配置入库规则");
         }
+        //最高层数
+        Integer maxLayerNum = structattrMapper.selectList(
+                new QueryWrapper<Structattr>()
+                        .select("MAX(layer_num) as layer_num")
+                        .eq("sect_code", param.getSect_code())
+        ).stream().findFirst().map(Structattr::getLayer_num).orElse(null);
+        if (maxLayerNum == null) {
+            maxLayerNum = 0;
+        }
         List<String> strategy = one.getStrategy();
         Map<String, Decisioner> decisionerMap = SpringContextHolder.getBeansOfType(Decisioner.class);
         QueryWrapper<Structattr> query = new QueryWrapper<Structattr>();
-          if ("3".equals(param.getSuitable_car())) {
+        if ("2FCP3C".equals(param.getStoragevehicle_type())) {
+            query.eq("is_used", true)
+                    .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
+                    .eq("sect_code", param.getSect_code())
+                    .eq("layer_num", maxLayerNum)
+                    .and(wrapper -> wrapper.isNull("storagevehicle_code")
+                            .or()
+                            .eq("storagevehicle_code", " "));
+        } else if ("3".equals(param.getSuitable_car())) {
             query.eq("is_used", true)
                     .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
                     .eq("sect_code", param.getSect_code())
@@ -372,7 +389,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
                     .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
                     .eq("sect_code", param.getSect_code())
                     .eq("width", 1)
-                    .ne("layer_num",4)
+                    .ne("layer_num", maxLayerNum)
                     .isNull("stor_type")
                     .and(wrapper -> wrapper.isNull("storagevehicle_code")
                             .or()
@@ -381,7 +398,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
             query.eq("is_used", true)
                     .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
                     .eq("sect_code", param.getSect_code())
-                    .eq("layer_num",4)
+                    .eq("layer_num", maxLayerNum)
                     .isNull("stor_type")
                     .and(wrapper -> wrapper.isNull("storagevehicle_code")
                             .or()
@@ -391,14 +408,22 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         if ("BCPCTZB".equals(param.getStoragevehicle_type())) {
             list = structattrMapper.getctnextcode();
         }
-
+        if ("2FCP3C".equals(param.getStoragevehicle_type()) && ObjectUtil.isEmpty(list)) {
+            query.eq("is_used", true)
+                    .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
+                    .eq("sect_code", param.getSect_code())
+                    .and(wrapper -> wrapper.isNull("storagevehicle_code")
+                            .or()
+                            .eq("storagevehicle_code", " "));
+            list = this.list(query);
+        }
         for (String decisionerType : strategy) {
             Decisioner decisioner = decisionerMap.get(decisionerType);
             log.info("执行入库规格:" + decisioner.strategyConfig.getStrategy_name());
             JSONObject params = (JSONObject) JSON.toJSON(param);
             list = decisioner.handler(list, params);
             if (CollectionUtils.isEmpty(list)) {
-                throw new BadRequestException("当前策略"+decisioner.strategyConfig.getStrategy_name()+"无可用货位,分配前数量:"+list.size());
+                throw new BadRequestException("当前策略" + decisioner.strategyConfig.getStrategy_name() + ",当前仓库：" + param.getStor_code() + ",当前库区：" + param.getSect_code() + "无可用货位,分配前数量:" + list.size());
             }
         }
         return list;

nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/base/NearbyRuleHandler.java

@@ -46,9 +46,8 @@ public class NearbyRuleHandler extends Decisioner<Structattr, JSONObject> {
      */
     @Override
     public List<Structattr> handler(List<Structattr> list, JSONObject param) {
-
         if (CollectionUtils.isEmpty(list)) {
-            throw new BadRequestException("当前分配策略无可用货位");
+            throw new BadRequestException("当前策略:就近放置策略"+"，当前仓库："+param.getString("stor_code")+"，当前库区："+param.getString("sect_code")+"，当前载具："+param.getString("storagevehicle_code")+"，当前载具类型："+param.getString("storagevehicle_type")+"，系统暂无空余库位，分配前数量:"+list.size());
         }
         List<Structattr> before = list.subList(0, list.size() > 10 ? 10 : list.size());
         log.info("就近分配前:" + before.stream().map(Structattr::getStruct_code).collect(Collectors.joining(",")));

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java

@@ -638,6 +638,7 @@ public class InBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv> i
                         .storagevehicle_type(param.getString("storagevehicle_type"))
                         .suitable_car(suitable_car)
                         .strategyMaters(maters)
+                        .storagevehicle_type(storagevehicle_stype)
                         .build());
         Structattr struct = structattrs.get(0);
         sect_id = struct.getSect_id();

nladmin-system/nlsso-server/src/main/java/org/nl/wms/wbwms/service/impl/WmsToIWmsServiceImpl.java

@@ -182,7 +182,7 @@ public class WmsToIWmsServiceImpl implements WmsToIWmsService {
         }
         String car_type=null;
         String car_width="685";
-        if(parm.getString("task_type").equals("1")){
+        if("1".equals(parm.getString("task_type"))){
             List<Structattr> regionCode = structattrMapper.selectList(new LambdaQueryWrapper<Structattr>()
                     .eq(Structattr::getSect_code, "1BCDJQ")
                     .eq(Structattr::getIs_used,true)
@@ -192,7 +192,7 @@ public class WmsToIWmsServiceImpl implements WmsToIWmsService {
             if(StringUtils.isBlank(pointCode)){
                 throw new BadRequestException("待检区域无库存");
             }
-            if(parm.getString("storagevehicle_type").equals("BCPHDL")){
+            if("BCPHDL".equals(parm.getString("storagevehicle_type"))||"2FCP3C".equals(parm.getString("storagevehicle_type"))){
                 car_type="1";
             }else{
                 car_type="2";
@@ -208,8 +208,8 @@ public class WmsToIWmsServiceImpl implements WmsToIWmsService {
             task_form.put("car_width",car_width);
             CheckInTask checkInTask = SpringContextHolder.getBean("CheckInTask");
             String task_id = checkInTask.create(task_form);
-        } else  if(parm.getString("task_type").equals("2")){
+        } else  if("2".equals(parm.getString("task_type"))){
-            if(parm.getString("storagevehicle_type").equals("BCPHDL")){
+            if("BCPHDL".equals(parm.getString("storagevehicle_type"))||"2FCP3C".equals(parm.getString("storagevehicle_type"))){
                 car_type="1";
             }else{
                 car_type="2";