From d02d14c3d3da27dc7c88e42aa99d8ec95375a92b Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Fri, 28 Feb 2025 15:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E6=8F=90=E4=BA=A4=E5=A4=9A=E6=9D=A1=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=A0=81=E7=9B=98=E4=B9=9F=E8=83=BD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                                | 14 +++++++-------
 .../web/controller/app/AppTaskController.java      |  6 ++++++
 .../mapper/app/AppPendingStorageMapper.xml         |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 23ae4f91..fa0cfe66 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -86,17 +86,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
index 74d2dce3..54c209d5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
@@ -264,6 +264,12 @@ public class AppTaskController extends BaseController
         ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){
             return error("缺少请求数据");
         }
+        AppPendingStorage appPendingStorage = new AppPendingStorage();
+        appPendingStorage.setVehicleNo(wcsStackerTask.getVehicleNo());
+        List<AppPendingStorage> appPendingStorages = appPendingStorageService.selectAppPendingStorageList(appPendingStorage);
+        if(appPendingStorages == null || appPendingStorages.isEmpty()){
+            return error("该载具似乎还未码盘");
+        }
         AppTask appTask = new AppTask();
         appTask.setVehicleId(wcsStackerTask.getVehicleNo());
         List<AppTask> appTasks = appTaskService.selectAppTaskList(appTask);
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
index c4661130..84f65235 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="recordId != null  and recordId != ''"> and record_id = #{recordId}</if>
             <if test="listId != null  and listId != ''"> and list_id = #{listId}</if>
+            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
             <if test="orderType != null "> and order_type = #{orderType}</if>
             <if test="customerId != null  and customerId != ''"> and customer_id = #{customerId}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>