From c51973b244a46f2540264a9be52bfe31cdf2e614 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 12 Mar 2025 14:13:51 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java | 2 ++
 .../nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java  | 1 +
 .../java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java  | 2 +-
 .../org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java     | 4 ----
 .../src/main/java/org/nl/wms/util/PointUtils.java             | 3 +--
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
index 88b5df0..396a76b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -109,6 +109,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         if(ObjectUtil.isEmpty(param.getString("create_mode"))){
             param.put("create_mode","3");
         }
+        log.info("ACS请求pdaApply参数: {}", param);
         try {
             result = this.apply(param);
         } catch (Exception e) {
@@ -147,6 +148,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         if(ObjectUtil.isNull(task)){
             throw new BadRequestException("任务类型不正确!requestMethodCode："+requestMethodName+",device_code："+device_code);
         }
+        log.info("ACS请求apply参数: {}", param);
         // 执行创建任务
         String task_code = task.apply(param);
         Map<String, String> parameters = new HashMap();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index ff7462e..93c47f6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -193,6 +193,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         entity.setCreate_time(now);
         entity.setUpdate_time(now);
         schBaseTaskMapper.insert(entity);
+        log.info("SchBaseTaskServiceImpl请求create参数: {}", entity);
         return entity.getTask_code();
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
index e62a139..c920690 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java
@@ -141,7 +141,7 @@ public class KJRKTask extends AbstractTask {
                     && StringUtils.isEmpty(schBasePoint.getIng_task_code())
                     && schBasePoint.getVehicle_qty() ==0
                     && ObjectUtil.isEmpty(schBasePoint.getVehicle_code2())) {
-                log.info("空架入库找到当前符合条件的点位{}", schBasePoint.getPoint_code());
+                log.info("空架入库找到当前符合条件的点位{}", schBasePoint);
                 return schBasePoint;
             }
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
index f821270..efbc118 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java
@@ -144,10 +144,6 @@ public class SSXBKJTask extends AbstractTask {
         if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
             throw new BadRequestException("该任务已取消!");
         }
-        // 获取参数
-        JSONObject extGroupData = ObjectUtil.isNotEmpty(taskObj.getExt_group_data())
-                ? JSONObject.parseObject(taskObj.getExt_group_data())
-                : null;
         String startPoint = taskObj.getPoint_code1(); // 获取起点
         String endPoint = taskObj.getPoint_code2(); // 获取终点
         SchBasePoint startPointObj = pointService.getById(startPoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
index 167d433..59d67f1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
@@ -37,7 +37,6 @@ public class PointUtils {
      */
     public static void clearPoint(SchBasePoint point) {
         SchBasePointServiceImpl pointService = SpringContextHolder.getBean(SchBasePointServiceImpl.class);
-//        point.setPoint_status(PointStatusEnum.EMPTY_POINT.getCode());
         point.setVehicle_type("");
         point.setVehicle_code("");
         point.setIng_task_code("");
@@ -46,6 +45,6 @@ public class PointUtils {
             point.setVehicle_qty(0);
         }
         point.setUpdate_time(DateUtil.now());
-        pointService.updateById(point);
+        pointService.update(point);
     }
 }