Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java

@@ -26,6 +26,7 @@ public enum RegionTypeEnum {
     TWO_KZ01("23", "二期捆扎区", "1754774130626007040"),
     TWO_FH01("24", "二期发货区", "1759453285649092608"),
     TWO_OUT01("25", "二期出库区", "1760141408548818944"),
+    TWO_BZC01("26", "二期主存区", "1748219897940414464"),
 
     B2_HKZC("26", "B2烘烤暂存区", "1766012860535803904");
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java

@@ -108,11 +108,11 @@ public abstract class AbstractAcsTask {
      *
      */
     public JSONObject immediateNotifyAcs(String task_id) {
-        List<AcsTaskDto> taskList = this.schedule();
-        if (ObjectUtil.isNotEmpty(taskList)) {
-            JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
-            return AcsUtil.notifyAcs("api/wms/task", arr);
-        }
+            List<AcsTaskDto> taskList = this.schedule();
+            if (ObjectUtil.isNotEmpty(taskList)) {
+                JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
+                return AcsUtil.notifyAcs("api/wms/task", arr);
+            }
         return null;
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -391,6 +391,7 @@ public class CheckOutBillController {
 
     @PostMapping("/testInBox")
     @Log("木箱入库测试")
+    @SaIgnore
     public ResponseEntity<Object> testInBox(@RequestBody JSONObject whereJson) {
         InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
         bean.inBox(whereJson);