From 255758e609eb1ce4bda1b320d860272e303ddc1c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sun, 28 Sep 2025 16:33:39 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=BB=E5=8A=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instruction/service/impl/InstructionServiceImpl.java   | 4 ++--
 .../ios_manage/service/impl/PdaEmpVehicleServiceImpl.java  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 3bc0a79..a86ab9d 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -430,14 +430,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                 ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
             }
             //判断是否是仙工AGV
-            if(CommonFinalParam.ONE.equals(route.getType())){
+           /* if(CommonFinalParam.ONE.equals(route.getType())){
                 HttpResponse response = xiangGongAgvService.sendOrderSequencesToXZ(dto);
                 if (ObjectUtils.isEmpty(response) || response.getStatus() != 200) {
                     dto.setSend_status("2");
                 } else {
                     dto.setSend_status("1");
                 }
-            }
+            }*/
         } catch (Exception e) {
             dto.setSend_status("2");
             e.printStackTrace();
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java
index 7869421..f0581cf 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java
@@ -168,7 +168,7 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
     private Structattr queryOutPoint(JSONObject whereJson) {
         // 默认库区为主存区
         String storagevehicle_type = whereJson.getString("storagevehicle_type");
-        Structattr attrDao = iStructattrService.getOne(new LambdaQueryWrapper<>(Structattr.class)
+        List<Structattr> list = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class)
                 .eq(Structattr::getSect_code, IOSConstant.SECT_CODE)
                 .eq(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
                 .eq(Structattr::getIs_emptyvehicle, IOSConstant.IS_DELETE_YES)
@@ -185,6 +185,9 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService {
                         Structattr::getStoragevehicle_type, IOSEnum.VEHICLE_TYPE_PUT.code("大料架（长边）"))
                 .orderByAsc(Structattr::getStruct_code)
         );
-        return attrDao;
+        if (ObjectUtil.isEmpty(list)) {
+            throw new BadRequestException("库内此类型空托盘不足！【" + whereJson.getString("storagevehicle_type") + "】");
+        }
+        return list.get(0);
     }
 }