Merge remote-tracking branch 'origin/master'

lms/nladmin-system/pom.xml

@@ -27,12 +27,19 @@
         <hutool.version>5.7.14</hutool.version>
         <jjwt.version>0.11.1</jjwt.version>
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
-        <jna.version>5.9.0</jna.version>
+        <jna.version>5.8.0</jna.version>
         <configuration.version>1.9</configuration.version>
     </properties>
 
     <dependencies>
 
+        <!-- 获取系统信息 -->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>6.1.4</version>
+        </dependency>
+
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -399,12 +406,7 @@
             <version>4.1.4</version>
         </dependency>
 
-        <!-- 获取系统信息 -->
+
-        <dependency>
-            <groupId>com.github.oshi</groupId>
-            <artifactId>oshi-core</artifactId>
-            <version>5.0.1</version>
-        </dependency>
 
         <!--loki-->
         <!-- https://loki4j.github.io/loki-logback-appender/#quick-start -->

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);
+                        JSONArray rowArr = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().getResultJSONArray(0);
-                        if (ObjectUtil.isEmpty(point_jo)) {
+
+                        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);
+                            for (int i = 0; i < rowArr.size(); i++) {
-                            point_code = jsonNewRow.getString("point_code");
+                                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);
+                        JSONArray rowArr = WQL.getWO("QST_ACSTOLMSTYPE4").addParam("flag", "3").process().getResultJSONArray(0);
-                        if (ObjectUtil.isEmpty(point_jo)) {
+
+                        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);
+                            for (int i = 0; i < rowArr.size(); i++) {
-                            point_code = jsonNewRow.getString("point_code");
+                                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;
+                                }
+                            }
                         }
                     }
 

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:

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -49,9 +49,9 @@ https://juejin.cn/post/6844903775631572999
 
 
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://47.111.78.178:27017/_bulk</url>
+        <url>http://10.1.3.90:9200/_bulk</url>
-        <index>logs-%date{yyyy-MM-dd}</index>
+        <index>lms_root</index>
-        <type>tester</type>
+        <type>lms_root</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
         <errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
         <connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->