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");
             }
         }
     }
diff --git a/src/main/resources/application-druid.properties b/src/main/resources/application-druid.properties
index 6446e93..4b8c6aa 100644
--- a/src/main/resources/application-druid.properties
+++ b/src/main/resources/application-druid.properties
@@ -12,12 +12,12 @@ spring.datasource.druid.master.password=HHrobot123.
 #spring.datasource.druid.master.password=hhsoftware
 # �ӿ�
 spring.datasource.druid.slave.open = false
-spring.datasource.druid.slave.url=jdbc:mysql://199.19.109.117:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+spring.datasource.druid.slave.url=jdbc:mysql://117.62.222.186:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.username=softhuaheng
 #spring.datasource.druid.master.password=HHrobot123.
 # ��ʼ������
 spring.datasource.druid.initial-size=4
-# ������ӳ�����
+# ������ӳ�����,�Ե�ǰCPU������2
 spring.datasource.druid.max-active=10
 # ��С���ӳ�����
 spring.datasource.druid.min-idle=4
@@ -47,5 +47,3 @@ logging.level.com.huaheng=debug
 logging.level.org.springframework=warn
 logging.level.spring.springboot.dao=DEBUG
 
-#���Է���˿ڡ�������ĿcontextPath
-server.servlet.context-path= /wms
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4e483c0..04a889c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,7 @@ huaheng:
   # 获取ip地址开关
   addressEnabled: false
 
-#测试服务端口、测试项目contextPath
+#服务端口、项目contextPath
 server:
   tomcat:
     uri-encoding: UTF-8
@@ -36,6 +36,8 @@ server:
     # 是否分配的直接内存
     direct-buffers: true
   port: 8888
+  servlet:
+    context-path: /wms
 
 # 用户配置
 user: