From b786992008f9e0a49b3abf186e81253b6dceaba4 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 30 Jun 2025 14:18:01 +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        | 14 ++++++++++++--
 .../service/sectStrategy/dao/StSectStrategy.java   |  3 +--
 2 files changed, 13 insertions(+), 4 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 0076684..b9664f6 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
@@ -324,7 +324,12 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
     }
 
 
-
+    /**
+     * 出库分配
+     * @param param：根据库区，需要物料及数量,单据,批次分配具体货位
+     * @return 返回结果为仓位--对应--货物组盘物料信息及出库冻结数量
+     * 当前分配不会自动锁定货位及冻结出库数量，分配完成后需要手动锁定货位并冻结出库数量
+     */
     @Override
     public List<StrategyStructMaterialVO> outBoundSectDiv(StrategyStructParam param) {
         //只校验仓库，库区
@@ -346,11 +351,16 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
         return list;
     }
 
+    /**
+     * 入库分配
+     * @param param：根据库区，需要物料及数量,单据,批次分配具体货位;按托进行分配：默认一托一个货位
+     * @return 返回结果为分配的具体仓位
+     * 当前分配不会自动锁定货位，分配完成后需要手动锁定货位
+     */
     @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("入库")));
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java
index fe800dc..8ff7bd0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java
@@ -47,8 +47,7 @@ public class StSectStrategy implements Serializable {
     /**
      * 策略类型
      */
-    @TableField(typeHandler = ListStrTypeHandler.class)
-    private List<String> strategy_type;
+    private String strategy_type;
 
     /**
      * 描述