diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml
index 1886638bd..741afd3ed 100644
--- a/lms/nladmin-system/pom.xml
+++ b/lms/nladmin-system/pom.xml
@@ -27,12 +27,19 @@
5.7.14
0.11.1
- 5.9.0
+ 5.8.0
1.9
+
+
+ com.github.oshi
+ oshi-core
+ 6.1.4
+
+
org.elasticsearch.client
elasticsearch-rest-high-level-client
@@ -399,12 +406,7 @@
4.1.4
-
-
- com.github.oshi
- oshi-core
- 5.0.1
-
+
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index dad119acb..bdcee21f0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -395,12 +395,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(joArr)) {
//查询新的一排
- JSONObject point_jo = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().uniqueResult(0);
- if (ObjectUtil.isEmpty(point_jo)) {
+ JSONArray rowArr = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().getResultJSONArray(0);
+
+ if (ObjectUtil.isEmpty(rowArr)) {
throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排!");
} else {
- JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq ASC").uniqueResult(0);
- point_code = jsonNewRow.getString("point_code");
+ for (int i = 0; i < rowArr.size(); i++) {
+ JSONObject point_jo = rowArr.getJSONObject(i);
+
+ JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
+ if (pointArr.size() == 3) {
+ JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq ASC").uniqueResult(0);
+ point_code = jsonNewRow.getString("point_code");
+ break;
+ }
+ }
}
} else {
// 校验此货位是否被堵住:1.如果被堵住则判断下一个是否被堵住 2.如果全部被堵住则新开一排
@@ -426,12 +435,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(point_code)) {
// 为空则新开一排
- JSONObject point_jo = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().uniqueResult(0);
- if (ObjectUtil.isEmpty(point_jo)) {
+ JSONArray rowArr = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().getResultJSONArray(0);
+
+ if (ObjectUtil.isEmpty(rowArr)) {
throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排!");
} else {
- JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq ASC").uniqueResult(0);
- point_code = jsonNewRow.getString("point_code");
+ for (int i = 0; i < rowArr.size(); i++) {
+ JSONObject point_jo = rowArr.getJSONObject(i);
+
+ JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
+ if (pointArr.size() == 3) {
+ JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq ASC").uniqueResult(0);
+ point_code = jsonNewRow.getString("point_code");
+ break;
+ }
+ }
}
}
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 152b8df80..1ff1ed0ae 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -117,6 +117,7 @@ mybatis-plus:
global-config:
db-config:
id-type: INPUT
+ banner: false
management:
health:
elasticsearch:
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 806be9f9d..b9c3082a1 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -49,9 +49,9 @@ https://juejin.cn/post/6844903775631572999
- http://47.111.78.178:27017/_bulk
- logs-%date{yyyy-MM-dd}
- tester
+ http://10.1.3.90:9200/_bulk
+ lms_root
+ lms_root
es-logger
es-error-logger
30000