fix: 修复呼叫料盒，呼叫出空托盘时，完成补充入库后，原库位没有解锁的问题。

易文鹏
1 parent d09efe68
Showing 1 changed file with 17 additions and 15 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -328,25 +328,27 @@ public class ReceiptTaskService {
         //如果是补充入库
         if (task.getTaskType().equals(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)) {
             String fromLocationCode = task.getFromLocation();
+            //修改库位状态和对应的容器
+            Location updateLocation = new Location();
+            updateLocation.setContainerCode("");
+            updateLocation.setWarehouseCode(warehouseCode);
+            updateLocation.setStatus(QuantityConstant.STATUS_LOCATION_EMPTY);
+            LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+            locationLambdaUpdateWrapper.eq(Location::getCode, fromLocationCode);
+            if (!locationService.update(updateLocation, locationLambdaUpdateWrapper)) {
+                throw new ServiceException("补充入库，更新库位失败");
+            }
+            
+            //解除右侧库位禁用和对应4个库位标记
+            Container container = containerService.getContainerByCode(task.getContainerCode());
+            locationService.unbanRightLocationAndUnmark(container.getContainerType(), fromLocationCode);
+            Location toLocation = locationService.getLocationByCode(task.getToLocation());
+
+
             inventoryHeader = inventoryHeaderService.getOne(new LambdaQueryWrapper<InventoryHeader>()
                     .eq(InventoryHeader::getLocationCode, fromLocationCode)
                     .eq(InventoryHeader::getContainerCode, task.getContainerCode()));
             if (inventoryHeader != null) {
-                //修改库位状态和对应的容器
-                Location updateLocation = new Location();
-                updateLocation.setContainerCode("");
-                updateLocation.setWarehouseCode(warehouseCode);
-                updateLocation.setStatus(QuantityConstant.STATUS_LOCATION_EMPTY);
-                LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate();
-                locationLambdaUpdateWrapper.eq(Location::getCode, fromLocationCode);
-                locationLambdaUpdateWrapper.eq(Location::getWarehouseCode, warehouseCode);
-                if (!locationService.update(updateLocation, locationLambdaUpdateWrapper)) {
-                    throw new ServiceException("补充入库，更新库位失败");
-                }
-                //解除右侧库位禁用和对应4个库位标记
-                Container container = containerService.getContainerByCode(task.getContainerCode());
-                locationService.unbanRightLocationAndUnmark(container.getContainerType(), fromLocationCode);
-                Location toLocation = locationService.getLocationByCode(task.getToLocation());
                 inventoryHeader.setLocationCode(task.getToLocation());
                 if (!inventoryHeaderService.updateById(inventoryHeader)) {
                     throw new ServiceException("补充入库，更新库存头表失败");