From 2a9cd7b3d05d953a62c80b4c80babc6a81aac46f Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 13 Mar 2024 17:07:29 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=B0=83=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java  |  2 +-
 .../main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java   |  2 +-
 .../iostorInv/impl/StIvtIostorinvOutServiceImpl.java   |  8 ++++++++
 .../wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  |  5 +++++
 .../src/main/java/org/nl/wms/sch/AcsTaskDto.java       |  2 +-
 .../org/nl/wms/sch/service/impl/TaskServiceImpl.java   | 10 +++++++++-
 .../nl/wms/st/outbill/rest/CheckOutBillController.java |  2 ++
 lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue   |  2 +-
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
index 797c9c009..fcc0ab6d1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
@@ -100,7 +100,7 @@ public class TwoLashTask extends AbstractAcsTask {
                     .class_type(json.getString("task_type"))
                     .dtl_type(String.valueOf(dtl_type))
                     .remark(json.getString("remark"))
-                    .interaction_json(interaction_json.toString())
+                    .interaction_json(interaction_json)
                     .build();
             resultList.add(dto);
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
index 411b5e6ff..2f80a0936 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
@@ -72,7 +72,7 @@ public class TwoOutTask extends AbstractAcsTask {
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
                     .next_device_code(json.getString("point_code2"))
-                    .vehicle_code(json.getString("vehicle_code"))
+                    .vehicle_code(json.getString("vehicle_code2"))
                     .priority(json.getString("priority"))
                     .class_type(json.getString("task_type"))
                     .dtl_type(String.valueOf(dtl_type))
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index a0bb901e2..0ca4dbb4c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1145,6 +1145,8 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
         // 点位表
         WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
+        // 载具扩展属性表
+        WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
 
         // 查询异常货位任务集合
         String TaskCodeIn = taskMangeList.stream()
@@ -1203,12 +1205,18 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 }
             }
 
+            // 查询木箱对应的载具
+            JSONObject jsonExt = extTab.query("storagevehicle_code = '" + json.getString("storagevehicle_code") + "'").uniqueResult(0);
+
             // 生成任务
             JSONObject jsonTaskParam = new JSONObject();
             jsonTaskParam.put("task_type", "010711");
             jsonTaskParam.put("point_code1", start_device_code);
             jsonTaskParam.put("point_code2", point_code);
             jsonTaskParam.put("vehicle_code", json.getString("storagevehicle_code"));
+            if (ObjectUtil.isNotEmpty(jsonExt)) {
+                jsonTaskParam.put("vehicle_code2", jsonExt.getString("storagevehicle_code"));
+            }
             jsonTaskParam.put("task_group_id", task_group_id);
             jsonTaskParam.put("is_auto_issue", is_auto_issue);
             jsonTaskParam.put("table_fk", disDaoList.get(0).getIostorinv_id().toString());
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 ec422b2fe..4d645910f 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
@@ -2016,6 +2016,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         point_code = inBussManageService.taskExceptional(whereJson);
                     }
                 }
+
+                if (ObjectUtil.isEmpty(point_code)) {
+                    throw new BadRequestException("点位为空!");
+                }
+
                 result.put("status", HttpStatus.OK.value());
                 result.put("message", "下发成功!");
                 result.put("point_code", point_code);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
index fb1fea313..08ad052de 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
@@ -108,7 +108,7 @@ public class AcsTaskDto {
     /**
      * 任务扩展字段
      */
-    private String interaction_json;
+    private JSONObject interaction_json;
     /**
      * 空点位
      */
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
index ca6799924..b702db515 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
@@ -32,6 +32,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -139,8 +140,15 @@ public class TaskServiceImpl implements TaskService {
                     // 任务处理类
                     String processing_class = taskObj.getString("handle_class");
                     String message = "";
+
                     try {
-                        Object obj = SpringContextHolder.getBean(Class.forName(processing_class));
+                        Object obj = new Object();
+                        try {
+                            obj = SpringContextHolder.getBean(Class.forName(processing_class));
+                        } catch (Exception e) {
+                            Class<?> clz = Class.forName(processing_class);
+                            obj = clz.newInstance();
+                        }
                         // 调用每个任务类的method_name()强制结束方法
                         Method m = obj.getClass().getMethod(method_name, String.class);
                         JSONObject result = (JSONObject) m.invoke(obj, task_id);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index a04fda9c5..c9ba1ce8a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.st.outbill.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -403,6 +404,7 @@ public class CheckOutBillController {
 
     @PostMapping("/testBoxLash")
     @Log("木箱捆扎测试")
+    @SaIgnore
     public ResponseEntity<Object> testBoxLash(@RequestBody JSONObject whereJson) {
         lashManageService.createLashTask(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
index 7c3d4934d..53a4a205d 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -375,7 +375,7 @@ export default {
         this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      this.form.stor_id = this.stor_id
+      this.form.stor_id = this.storId
       crudRawAssist.divPoint(this.form).then(res => {
         crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
           this.openParam = res