diff --git a/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue b/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
index 243ebe8..0499a79 100644
--- a/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
@@ -89,6 +89,9 @@ export default {
         name: [
           {required: true, message: '请输入名称!'},
         ],
+        locationType:  [
+          {required: true, message: '请输入库位类型!'},
+        ],
       },
       url: {
         add: "/config/containerType/add",
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
index 097d820..33696b5 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
@@ -120,6 +120,9 @@ export default {
           this.portList = res.result;
           this.model = Object.assign({}, record);
           this.visible = true;
+          // this.$message.success(res.message);
+        } else {
+          this.$message.warning(res.message);
         }
       });
     }
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 23cec79..13e605f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.IContainerService;
 import org.jeecg.modules.wms.config.location.entity.Location;
@@ -40,7 +41,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSON;
-import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
@@ -139,7 +139,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             }
         }
         if (over) {
-            return Result.OK("出库单已经配盘", null);
+            return Result.error("出库单已经配盘", null);
         }
         return Result.OK("自动组盘成功", null);
     }
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 3d91715..df6cd61 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -12,6 +12,7 @@ import javax.annotation.Resource;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.wms.api.wcs.service.LocationAllocationService;
 import org.jeecg.modules.wms.api.wcs.service.WcsService;
@@ -66,7 +67,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSON;
-import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -1199,7 +1199,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
             throw new JeecgBootException("完成入库任务时，保存库存交易失败");
         }
 
-        if (StringUtils.isEmpty(fromLocationCode)) {
+        if (StringUtils.isNotEmpty(fromLocationCode)) {
             success =
                 locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
             if (!success) {