fix:修复虚拟货位生成只到100的问题

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java

@@ -615,7 +615,6 @@ public class StructattrServiceImpl implements StructattrService {
         schBasePointService.update(jsonPoint);
         return null;
     }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void oneCreate(JSONObject whereJson) {
@@ -666,20 +665,20 @@ public class StructattrServiceImpl implements StructattrService {
         } else {
             // 截取第一个 - 之前的数据集合
 
-            List<JSONObject> attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "2").process()
+            List<JSONObject> attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "21").process()
                     .getResultJSONArray(0).toJavaList(JSONObject.class);
 
             List<String> subStringList = attrList.stream()
                     .filter(row -> row.getString("struct_code").contains("-"))
                     .map(row -> row.getString("struct_code").substring(0, row.getString("struct_code").indexOf("-")))
                     .distinct()
-                    .sorted()
                     .filter(row -> row.matches("-?\\d+(\\.\\d+)?"))
                     .collect(Collectors.toList());
-
-            prefix = String.valueOf(Integer.parseInt(subStringList.get(subStringList.size() - 1)) + 1);
+            List<String> collect = subStringList.stream().filter(a -> !a.equals("01"))
+                    .sorted(Comparator.comparingInt(Integer::valueOf))
+                    .collect(Collectors.toList());
+            prefix = String.valueOf(Integer.parseInt(collect.get(collect.size() - 1)) + 1);
         }
-
         /*
          *  生成货位
          */

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql

@@ -105,6 +105,19 @@
 			ENDSELECT
 		ENDQUERY
 	ENDIF
+	IF 输入.flag = "21"
+    		QUERY
+    			SELECT
+                    struct.struct_code
+                FROM
+                        st_ivt_structattr struct
+                        LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = struct.sect_id
+                WHERE
+                     sect.sect_type_attr = '09'
+
+    			ENDSELECT
+    		ENDQUERY
+    	ENDIF
 
 	IF 输入.flag = "3"
 		PAGEQUERY

lms/nladmin-system/src/main/resources/config/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.87}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:NLABC&hl123}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数