From 1b6871cb59aa55c2e24a82d162e491a1c8b611ee Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 14 May 2025 16:11:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=94=9F=E6=88=90=E5=8F=AA=E5=88=B0100?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructattrServiceImpl.java | 11 +++++------ .../org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql | 13 +++++++++++++ .../src/main/resources/config/application-dev.yml | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index 85882e524..1cee1a6c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/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 attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "2").process() + List attrList = WQL.getWO("QST_STRUCT_ATTR").addParam("flag", "21").process() .getResultJSONArray(0).toJavaList(JSONObject.class); List 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 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); } - /* * 生成货位 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql index ed3506ac8..ea74922b3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql +++ b/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 diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index 647cce61d..5514c6c14 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/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 # 最小连接数