diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
index 2b75b67..094c925 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -289,7 +289,7 @@ public class ShipmentTaskService {
         task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
         taskHeaderService.updateById(task);
         /* 更新库位和容器*/
-        updateLocationContainer(task.getFromLocation(), task.getToLocation(), task.getContainerCode(), task.getTaskType());
+        updateShipmentLocationContainer(task.getFromLocation(), task.getToLocation(), task.getContainerCode(), task.getTaskType());
 
         //设置出库货箱表头状态为拣货任务完成
         LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
@@ -341,7 +341,7 @@ public class ShipmentTaskService {
      * @param containerCode 容器编码
      * @param taskType 任务类型
      */
-    public void updateLocationContainer(String fromLocation, String toLocation, String containerCode, Integer taskType){
+    public void updateShipmentLocationContainer(String fromLocation, String toLocation, String containerCode, Integer taskType){
         //将库位状态改为空闲，如果是整出的对应的容器也清空
         Location fromLocationRecord = locationService.findLocationByCode(fromLocation);
         if (StringUtils.isNull(fromLocationRecord)) {
@@ -384,10 +384,12 @@ public class ShipmentTaskService {
             //查询是否存在关联的库存，入如果没有就修改容器状态为empty
             LambdaQueryWrapper<InventoryDetail> inventoryDetaillambdaQueryWrapper = Wrappers.lambdaQuery();
             inventoryDetaillambdaQueryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
-            List<InventoryDetail> detailList = inventoryDetailService.list();
+            List<InventoryDetail> detailList = inventoryDetailService.list(inventoryDetaillambdaQueryWrapper);
             //库存查询不到该容器就把容器状态改为可用
             if (detailList.isEmpty()) {
-                containerService.updateLocationCodeAndStatus(containerCode, "", "empty");
+                containerService.updateLocationCodeAndStatus(containerCode, toLocation, "empty");
+            } else {
+                containerService.updateLocationCodeAndStatus(containerCode, toLocation, "some");
             }
         }
     }