From df225f1645045d7351b4c1c7e6f0fdd831f12f2e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 26 Aug 2025 15:54:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sch/task/service/dao/SchBaseTask.java | 30 ++++++++++++-------
 .../nl/wms/sch/task_manage/AbstractTask.java  |  6 ++--
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java
index 22cb98d..b719b53 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java
@@ -53,18 +53,14 @@ public class SchBaseTask implements Serializable {
     /** 载具类型 */
     private String vehicle_type;
 
+    /** 组盘id */
+    private String group_id;
+
     /** 载具编码 */
     private String vehicle_code;
-    /**
-     * 载具物料信息
-     */
-    private String material_code;
-    /** 载具数量 */
-    private Integer qty;
-    /**
-     *
-     */
-    private Integer pcsn;
+
+    /** 载具编码2 */
+    private String vehicle_code2;
 
     /** 车号 */
     private String car_no;
@@ -72,6 +68,20 @@ public class SchBaseTask implements Serializable {
     /** 组盘物料数据 */
     private String group_data;
 
+    /** 任务组id */
+    private String task_group_id;
+
+    /** 任务组序号 */
+    private BigDecimal task_group_seq;
+
+    /** acs链路id */
+    private String acs_trace_id;
+
+    /** 请求参数 */
+    private String request_param;
+
+    /** 反馈参数 */
+    private String response_param;
     /** 备注 */
     private String remark;
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 65d63b9..fd5d326 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -37,8 +37,7 @@ import java.util.List;
  */
 @Slf4j
 @Component
-public abstract class
-AbstractTask {
+public abstract class AbstractTask {
     @Autowired
     private ISchBaseTaskService taskService;
     @Autowired
@@ -100,6 +99,7 @@ AbstractTask {
             taskDto.setStart_device_code2(task.getPoint_code3());
             taskDto.setNext_device_code2(task.getPoint_code4());
             taskDto.setVehicle_code(task.getVehicle_code());
+            taskDto.setVehicle_code2(task.getVehicle_code2());
             this.setTask(task.getConfig_code(), taskDto);
             // 如果各类方法对返回参数有不同，可以通过调用子类实现的deliveryBeforeProcessing方法来完成赋值，也可以是统一封装到参数值中。
             this.deliveryBeforeProcessing(task, taskDto);
@@ -291,6 +291,7 @@ AbstractTask {
         AbstractTask bean = SpringContextHolder.getBean(this.getClass());
 
         // 2、创建申请任务
+        task.setAcs_trace_id(requestNo);
         task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr());
         task.setConfig_code(configCode);
@@ -298,6 +299,7 @@ AbstractTask {
         task.setVehicle_type(vehicleType);
         task.setTask_status(TaskStatus.APPLY.getCode());
         // 将所有参数存到表中，后续需要可以提取
+        task.setRequest_param(JSONObject.toJSONString(param));
         TaskUtils.setCreateByAcsOrPda(task, param);
 
         // 3、判断是否直接找点下发