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 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 false ${project.artifactId} - - + + ${project.artifactId} - \ No newline at end of file + 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 appPendingStorages = appPendingStorageService.selectAppPendingStorageList(appPendingStorage); + if(appPendingStorages == null || appPendingStorages.isEmpty()){ + return error("该载具似乎还未码盘"); + } AppTask appTask = new AppTask(); appTask.setVehicleId(wcsStackerTask.getVehicleNo()); List 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" and record_id = #{recordId} and list_id = #{listId} + and vehicle_no = #{vehicleNo} and order_type = #{orderType} and customer_id = #{customerId} and order_id = #{orderId}