From 61dd3569ff24eac8bc433fef6fac5f0be53a8d28 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 23 Aug 2023 09:14:53 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E5=8E=BB=E9=99=A4=E8=BD=BD=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  | 2 +-
 .../main/java/org/nl/wms/sch/task_manage/AbstractTask.java    | 2 +-
 .../nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 2ec7842..68aaf01 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -756,7 +756,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         // 载具类型不为空，并且不是0的情况，lmsVehicleTypeShift:转成lms的载具类型
         if (ObjectUtil.isNotEmpty(vehicleType) && !vehicleType.equals(GeneralDefinition.NO)) {
-            schBasePoint.setVehicle_type(TaskUtils.toLmsVehicleTypeShift(vehicleType));
+            schBasePoint.setVehicle_type(vehicleType);
         }
         if (ObjectUtil.isNotEmpty(action)) {
             schBasePoint.setIs_used(action.equals(GeneralDefinition.YES));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 941fce9..c2485b5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -237,7 +237,7 @@ public abstract class AbstractTask {
         String apply_point_code = param.getString("device_code"); // 请求点
         String config_code = param.getString("config_code");
         String requestNo = param.getString("requestNo");
-        String vehicleType = TaskUtils.toAcsVehicleTypeShift(param.getString("vehicle_type"));
+        String vehicleType = param.getString("vehicle_type");
         String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
         // 1、校验数据
         SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
index 35db0a3..f078ea0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
@@ -124,7 +124,7 @@ public class TaskUtils {
         return list.size() > 0;
     }
 
-    /**
+    /**不需要转换
      * 转成ACS需要的载具类型
      * ACS载具类型：1 2 3 ...
      * LMS载具类型：3 4 5 ...
@@ -144,7 +144,7 @@ public class TaskUtils {
         return lmsVehicleType;
     }
 
-    /**
+    /**不需要转换
      * 转成LMS需要的载具类型
      * ACS载具类型：1 2 3 ...
      * LMS载具类型：3 4 5 ...