From cabcd9d2333516fcca2c530956c7cf98b7300351 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 14 Mar 2024 17:50:04 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/impl/StIvtIostorinvServiceImpl.java  |  2 +-
 .../util/impl/OutBoxManageServiceImpl.java         |  6 ++++--
 .../util/impl/OutVehicleManageServiceImpl.java     |  5 +++--
 .../util/service/OutBoxManageService.java          |  2 +-
 .../util/service/OutVehicleManageService.java      |  2 +-
 .../ext/acs/service/impl/AcsToWmsServiceImpl.java  | 14 +++++++++++---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 23ca7ec41..1648810d3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -473,7 +473,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
 
         // 创建任务
         JSONObject jsonTaskParam = new JSONObject();
-        jsonTaskParam.put("task_type", "010702");
+        jsonTaskParam.put("task_type", "010703");
         jsonTaskParam.put("start_device_code", pointDto.getPoint_code());
         jsonTaskParam.put("next_device_code", jsonDis.getString("struct_code"));
         jsonTaskParam.put("vehicle_code", jsonDis.getString("box_no"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
index 278b07cec..3234ab2a7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
@@ -165,7 +165,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
 
     @Override
     @Transactional
-    public void taskExceptionalOut(JSONObject jsonObject) {
+    public String taskExceptionalOut(JSONObject jsonObject) {
         // 任务表
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
         // 仓位表
@@ -201,9 +201,11 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         taskParam.put("task_type", "010712");
 
         TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
-        taskBean.createTask(taskParam);
+        String task_id = taskBean.createTask(taskParam);
         taskBean.immediateNotifyAcs(null);
 
+        return task_id;
+
     }
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
index c761820df..35d24b051 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
@@ -151,7 +151,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
 
     @Override
     @Transactional
-    public void taskExceptionalOut(JSONObject jsonObject) {
+    public String taskExceptionalOut(JSONObject jsonObject) {
         // 任务表
         WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
         // 仓位表
@@ -187,8 +187,9 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
         taskParam.put("task_type", "010712");
 
         TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
-        taskBean.createTask(taskParam);
+        String task_id = taskBean.createTask(taskParam);
         taskBean.immediateNotifyAcs(null);
+        return task_id;
     }
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
index 297ee3014..1f0c7da79 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBoxManageService.java
@@ -40,6 +40,6 @@ public interface OutBoxManageService {
      *            task_code : 任务编码
      * }
      */
-    void taskExceptionalOut(JSONObject jsonObject);
+    String taskExceptionalOut(JSONObject jsonObject);
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java
index c19e03261..2f6eca134 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutVehicleManageService.java
@@ -36,6 +36,6 @@ public interface OutVehicleManageService {
      *            task_code : 任务编码
      * }
      */
-    void taskExceptionalOut(JSONObject jsonObject);
+    String taskExceptionalOut(JSONObject jsonObject);
 
 }
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 14c706b5a..c3db03f3f 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
@@ -177,7 +177,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     }
                     // 任务处理类
                     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();
+                        }
                         // 调用每个任务类的forceFinishInst()强制结束方法
                         Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class);
                         m.invoke(obj, row, status);
@@ -2001,7 +2007,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         point_code = outBoxManageService.taskExceptional(whereJson);
                     }
                     if (type.equals("3")) {
-                        outBoxManageService.taskExceptionalOut(whereJson);
+                        String task_id = outBoxManageService.taskExceptionalOut(whereJson);
+                        result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) {
                     // 托盘入库：满入、浅货位有货-放货时
@@ -2014,7 +2021,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         point_code = outVehicleManageService.taskExceptional(whereJson);
                     }
                     if (type.equals("3")) {
-                        outVehicleManageService.taskExceptionalOut(whereJson);
+                        String task_id = outVehicleManageService.taskExceptionalOut(whereJson);
+                        result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) {
                     // 成品入库：满入、浅货位有货-放货时