add:增加打包间子卷信息展示

lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java

@@ -196,7 +196,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService {
             whereJson.put("bill_type", IOSEnum.IN_TYPE.code("手工入库"));
         }
         whereJson.put("box_no", whereJson.getString("box_no"));
-        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status = '0'").getResultJSONArray(0);
+        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0);
         if (ObjectUtil.isEmpty(resultJSONArray)) {
             throw new BadRequestException("未查询到子卷包装信息!");
         }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java

@@ -181,6 +181,7 @@ public class DjqTask extends AbstractAcsTask {
 
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java

@@ -159,6 +159,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java

@@ -130,6 +130,7 @@ public class GzqTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java

@@ -142,6 +142,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java

@@ -117,6 +117,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java

@@ -116,6 +116,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java

@@ -115,6 +115,7 @@ public class ShiftingTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java

@@ -194,6 +194,7 @@ public class ZxDjwTask extends AbstractAcsTask {
 
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java

@@ -288,6 +288,7 @@ public class ZxqTask extends AbstractAcsTask {
     }
 
     @Override
+    @Transactional
     public String createTask(JSONObject form) {
         Assert.notNull(form, "请求参数不能为空");
         String taskType = form.getString("task_type");

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java

@@ -161,6 +161,11 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
             }
 
         }
+        JSONObject jsonBox;
+        if (structArray.size() == 1){
+            jsonBox = structArray.getJSONObject(0);
+        }else {
+            //大于一个的话则走查找逻辑
             // 确定巷道：找相同规格木箱的最多的巷道
             if (ObjectUtil.isEmpty(block_num)) {
                 block_num = getMaxBlock(whereJson);
@@ -171,9 +176,9 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
             // 确定仓位
             whereJson.put("row_num", row_num);
             whereJson.put("notMove",true);
-        JSONObject jsonAttr = getBox(whereJson);
+            jsonBox = getBox(whereJson);
             // 为空则新找巷道
-        if (ObjectUtil.isEmpty(jsonAttr)) {
+            if (ObjectUtil.isEmpty(jsonBox)) {
                 whereJson.put("flag", "1");
                 notOutBlockList.add(whereJson.getString("block_num"));
                 String join = "('" + String.join("','", notOutBlockList) + "')";
@@ -192,31 +197,31 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
                     json.put("row_num", row_num_2);
                     JSONObject jsonAttr_2 = getBox(json);
                     if (ObjectUtil.isNotEmpty(jsonAttr_2)) {
-                    jsonAttr = jsonAttr_2;
+                        jsonBox = jsonAttr_2;
                         break;
-                } else {
-                    continue;
                     }
                 }
             }
-        if (ObjectUtil.isEmpty(jsonAttr)) {
+        }
+
+        if (ObjectUtil.isEmpty(jsonBox)) {
             notOutRowList.clear();
             notOutBlockList.clear();
             throw new BadRequestException("没有符合规格的木箱!");
         }
         // 查询木箱对应的托盘号
-        JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonAttr.getString("storagevehicle_code") + "'")
+        JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonBox.getString("storagevehicle_code") + "'")
                 .uniqueResult(0);
         if (ObjectUtil.isEmpty(jsonVeExt)) {
-            throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code"));
+            throw new BadRequestException("此木箱没有绑定托盘号!"+jsonBox.getString("storagevehicle_code"));
         }
         // 锁定起点
-        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
+        jsonBox.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
-        attrTab.update(jsonAttr);
+        attrTab.update(jsonBox);
         // 清空缓存
         notOutRowList.clear();
         notOutBlockList.clear();
-        return jsonAttr.getString("storagevehicle_code");
+        return jsonBox.getString("storagevehicle_code");
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequiredArgsConstructor
 
-@RequestMapping("/api/szls")
+@RequestMapping("/api/szls/getStructInfo")
 @Slf4j
 public class LmsToBigScreenController {
     private final LmsToBigScreenService LmsToBigScreenService;

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

@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

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

@@ -134,6 +134,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="info">
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>