From 014861ce99ad75a1666019487f00b77a191e5ad3 Mon Sep 17 00:00:00 2001
From: zhengxuming <zhengxuming>
Date: Thu, 14 Aug 2025 10:28:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext_manage/service/impl/MesToWmsServiceImpl.java   |  1 +
 .../ios_manage/service/impl/PdaIosInServiceImpl.java   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java
index d800e40..509620d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java
@@ -528,6 +528,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
                     param.put("site_code",dto.getDevice_code());
                     param.put("sect_id",sectattr.getSect_id());
                     param.put("sect_code",sectattr.getSect_code());
+                    param.put("back_material_flag",true);
                     pdaIosInService.vehicleInConfirm(param);
                 } else{
                     throw new BadRequestException("任务类型有误！请传入1或2");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
index 4cf5a0b..1e5be77 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -566,8 +566,11 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     public PdaResponse vehicleInConfirm(JSONObject whereJson) {
         //空载具入库
         Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code"));
-        if(sectattr == null){
-            throw new BadRequestException("库区" + whereJson.getString("sect_code") +"不存在");
+        if (sectattr == null) {
+            sectattr = sectattrService.findByCode(whereJson.getString("sect_code"));
+            if (sectattr == null) {
+                throw new BadRequestException("库区" + whereJson.getString("sect_code") + "不存在");
+            }
         }
 
         whereJson.put("sect_code", sectattr.getSect_code());
@@ -588,7 +591,8 @@ public class PdaIosInServiceImpl implements PdaIosInService {
         if(schBasePointList.size()>1){
             throw new BadRequestException("存在重复点位，请确认");
         }
-        if(!"2".equals(schBasePointList.get(0).getPoint_status())){
+        if(!"2".equals(schBasePointList.get(0).getPoint_status())
+                && !whereJson.containsKey("back_material_flag")){
             throw new BadRequestException("点位状态不为空载具，请核对！");
         }