From 7c0758f3bc5b42732d1165c262a0706fee4416a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM>
Date: Wed, 15 Oct 2025 20:02:03 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch_manage/service/util/tasks/StInTask.java    | 3 ---
 .../org/nl/wms/sch_manage/service/util/tasks/StOutTask.java   | 3 ---
 .../nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java  | 3 ---
 .../service/impl/RawAssistIStorServiceImpl.java               | 3 +++
 .../nlsso-server/src/main/resources/logback-spring.xml        | 4 ++++
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
index f4f7481..b6696f8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
@@ -86,9 +86,6 @@ public class StInTask extends AbstractTask {
         acsTaskDto.setTask_code(taskDao.getTask_code());
         acsTaskDto.setStart_device_code(taskDao.getPoint_code1());
         acsTaskDto.setNext_device_code(taskDao.getPoint_code2());
-        if (taskDao.getPoint_code2().contains("-")) {
-            acsTaskDto.setNext_device_code(taskDao.getPoint_code2().replace('-', '_'));
-        }
         acsTaskDto.setPriority(taskDao.getPriority());
         acsTaskDto.setTask_type("1");
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
index ac8aa0b..973ddd0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
@@ -75,9 +75,6 @@ public class StOutTask extends AbstractTask {
         acsTaskDto.setFloor_code(param.getString("floor_code"));
         acsTaskDto.setStart_device_code(taskDao.getPoint_code1());
         acsTaskDto.setNext_device_code(taskDao.getPoint_code2());
-        if (taskDao.getPoint_code2().contains("-")) {
-            acsTaskDto.setNext_device_code(taskDao.getPoint_code2().replace('-', '_'));
-        }
         acsTaskDto.setPriority(taskDao.getPriority());
         acsTaskDto.setTask_type("1");
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
index bbdd0aa..6988ac3 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
@@ -73,9 +73,6 @@ public class VehicleOutTask extends AbstractTask {
         acsTaskDto.setTask_code(taskDao.getTask_code());
         acsTaskDto.setStart_device_code(taskDao.getPoint_code1());
         acsTaskDto.setNext_device_code(taskDao.getPoint_code2());
-        if (taskDao.getPoint_code2().contains("-")) {
-            acsTaskDto.setNext_device_code(taskDao.getPoint_code2().replace('-', '_'));
-        }
         acsTaskDto.setPriority(taskDao.getPriority());
         acsTaskDto.setTask_type("1");
 
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
index 8e6c4e7..1e3222a 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
@@ -844,6 +844,9 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
         //根据分配明细分配仓位
         IOStorInvDis dis = ioStorInvDisMapper.selectOne(new LambdaQueryWrapper<>(IOStorInvDis.class)
                 .eq(IOStorInvDis::getIostorinv_id,iostorinv_id));
+        if(null ==  dis){
+            throw new BadRequestException("分配明细为空，原因为组盘为空！");
+        }
         JSONObject dis_form = new JSONObject();
 
         ArrayList<LinkedHashMap> tableMater = new ArrayList<>();
diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index d2c9927..367b419 100644
--- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -33,6 +33,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <!-- 新增这行，指定字符集为UTF-8 -->
+            <charset>${log.charset}</charset>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
@@ -49,6 +51,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <!-- 新增这行，指定字符集为UTF-8 -->
+            <charset>${log.charset}</charset>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>