FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复任务完成时提交多条任务的问题；修复没有码盘也能入库的情况

Browse Source
This commit is contained in:
葛林强 2025-02-28 15:30:39 +08:00
parent 0e122ed15c
commit d02d14c3d3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/pom.xml
View File

@ -86,17 +86,17 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
</build> </build>
</project> </project>

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
View File

@ -264,6 +264,12 @@ public class AppTaskController extends BaseController
ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){ ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){
return error("缺少请求数据"); 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 appTask = new AppTask();
appTask.setVehicleId(wcsStackerTask.getVehicleNo()); appTask.setVehicleId(wcsStackerTask.getVehicleNo());
List<AppTask> appTasks = appTaskService.selectAppTaskList(appTask); List<AppTask> appTasks = appTaskService.selectAppTaskList(appTask);

1
ruoyi-system/src/main/resources/mapper/app/AppPendingStorageMapper.xml
View File

@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="recordId != null and recordId != ''"> and record_id = #{recordId}</if> <if test="recordId != null and recordId != ''"> and record_id = #{recordId}</if>
<if test="listId != null and listId != ''"> and list_id = #{listId}</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="orderType != null "> and order_type = #{orderType}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if> <if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if> <if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>