diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
index d9028ea..a898466 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
@@ -268,8 +268,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 .last(" limit 20");
 
         List<Location> totalLocationList = locationService.list(wrapper);
-        //双伸位预留库位数不够了就排除掉该巷道
-        if (totalLocationList.size() <= reserveNumber) {
+        //双伸位预留库位数不够了就排除掉该巷道，9和10巷道是单伸位，不用预留库位
+        if (totalLocationList.size() <= reserveNumber && !roadWay.equals("9") && !roadWay.equals("10")) {
             return "可能是库位不够用了，请检查预留库位数";
         }
 
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
index 5408344..7510da9 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
@@ -897,24 +897,22 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
             List<InventoryDetail> inventoryList = shippingCombinationService.getInventorys(item, true, true);
             //去除已锁的库存
             ArrayList<InventoryDetail> removeInventoryList = new ArrayList<>();
-            List<TaskHeader> taskHeaderList = taskHeaderService.getUnCompleteTaskList();
+            //List<TaskHeader> taskHeaderList = taskHeaderService.getUnCompleteTaskList();
             List<ReceiptContainerHeader> receiptContainerHeaderList = receiptContainerHeaderService.getUnCompleteCombineList();
             boolean lock = false;
             for (InventoryDetail inventoryDetail : inventoryList) {
-                LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
-                containerLambdaQueryWrapper.eq(Container::getCode, inventoryDetail.getContainerCode());
-                Container container = containerService.getOne(containerLambdaQueryWrapper);
+                Container container = containerService.getContainerByCode(inventoryDetail.getContainerCode());
                 if (QuantityConstant.STATUS_CONTAINER_LOCK.equals(container.getStatus())) {
                     removeInventoryList.add(inventoryDetail);
                     lock = true;
                 }
-                if (taskHeaderList != null) {
-                    for (TaskHeader taskHeader : taskHeaderList) {
-                        if (taskHeader.getContainerCode().equals(container.getCode())) {
-                            removeInventoryList.add(inventoryDetail);
-                        }
-                    }
-                }
+                //if (taskHeaderList != null) {
+                //    for (TaskHeader taskHeader : taskHeaderList) {
+                //        if (taskHeader.getContainerCode().equals(container.getCode())) {
+                //            removeInventoryList.add(inventoryDetail);
+                //        }
+                //    }
+                //}
                 if (receiptContainerHeaderList != null) {
                     for (ReceiptContainerHeader receiptContainerHeader : receiptContainerHeaderList) {
                         if (receiptContainerHeader.getContainerCode().equals(container.getCode())) {