root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangzq
2025-05-14 16:11:49 +08:00
parent 40addef8a1
commit 1b6871cb59
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,7 +615,6 @@ public class StructattrServiceImpl implements StructattrService {
schBasePointService.update(jsonPoint); schBasePointService.update(jsonPoint);
return null; return null;
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void oneCreate(JSONObject whereJson) { public void oneCreate(JSONObject whereJson) {
@@ -666,20 +665,20 @@ public class StructattrServiceImpl implements StructattrService {
} else { } 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); .getResultJSONArray(0).toJavaList(JSONObject.class);
List<String> subStringList = attrList.stream() List<String> subStringList = attrList.stream()
.filter(row -> row.getString("struct_code").contains("-")) .filter(row -> row.getString("struct_code").contains("-"))
.map(row -> row.getString("struct_code").substring(0, row.getString("struct_code").indexOf("-"))) .map(row -> row.getString("struct_code").substring(0, row.getString("struct_code").indexOf("-")))
.distinct() .distinct()
.sorted()
.filter(row -> row.matches("-?\\d+(\\.\\d+)?")) .filter(row -> row.matches("-?\\d+(\\.\\d+)?"))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<String> collect = subStringList.stream().filter(a -> !a.equals("01"))
prefix = String.valueOf(Integer.parseInt(subStringList.get(subStringList.size() - 1)) + 1); .sorted(Comparator.comparingInt(Integer::valueOf))
.collect(Collectors.toList());
prefix = String.valueOf(Integer.parseInt(collect.get(collect.size() - 1)) + 1);
} }
/* /*
* 生成货位 * 生成货位
*/ */

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

@@ -105,6 +105,19 @@
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF 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" IF 输入.flag = "3"
PAGEQUERY PAGEQUERY

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

@@ -6,9 +6,9 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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} username: ${DB_USER:root}
password: ${DB_PWD:NLABC&hl123} password: ${DB_PWD:123456}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5
# 最小连接数 # 最小连接数