fix: 修复完成平库整盘出库任务，删除库位和容器的bug

易文鹏
1 parent f1791980
Showing 1 changed file with 9 additions and 3 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -448,9 +448,15 @@ public class ShipmentTaskService {
         //平库删除库位和容器
         if (task.getTaskType().equals(QuantityConstant.TASK_TYPE_WHOLESHIPMENT) && task.getFlat() != null && task.getFlat() == 1) {
             if (StringUtils.isNotEmpty(task.getFromLocation())) {
-                locationService.remove(new LambdaQueryWrapper<Location>().eq(Location::getCode, task.getFromLocation()));
-                if (!containerService.remove(new LambdaQueryWrapper<Container>().eq(Container::getCode, task.getContainerCode()))) {
-                    throw new ServiceException("删除容器失败:" + task.getContainerCode());
+                //删除库位
+                if (locationService.getOne(new LambdaQueryWrapper<Location>().eq(Location::getCode, task.getFromLocation())) != null) {
+                    locationService.remove(new LambdaQueryWrapper<Location>().eq(Location::getCode, task.getFromLocation()));
+                }
+                //删除容器
+                if (containerService.getOne(new LambdaQueryWrapper<Container>().eq(Container::getCode, task.getContainerCode())) != null) {
+                    if (!containerService.remove(new LambdaQueryWrapper<Container>().eq(Container::getCode, task.getContainerCode()))) {
+                        throw new ServiceException("删除容器失败:" + task.getContainerCode());
+                    }
                 }
             }
         } else {