diff --git a/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java b/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java
index 0beb960..3749c44 100644
--- a/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java
@@ -100,6 +100,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return AjaxResult.success("更新成功！");
     }
 
+    @Override
     public List<Map<String, Object>> getCode(){
         LambdaQueryWrapper<Company> lambda = Wrappers.lambdaQuery();
         lambda.select(Company::getCode, Company::getId, Company::getName)
diff --git a/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java b/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
index 76f11f5..1db5e0c 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
@@ -85,12 +85,13 @@ public class ReceivingService {
     @Transactional
     public Boolean position(ReceiptContainerDetail receiptContainerDetail){
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
-        if (!(0 ==receiptContainerHeader.getStatus())){
+        if (0 != receiptContainerHeader.getStatus()){
             throw new ServiceException("该入库组盘已生成任务不能重新定位");
         }
         //如果入库组盘表中有目标库位说明已经指定
         if (StringUtils.isNotEmpty(receiptContainerHeader.getToLocation())){return true;}
-        String locatingRule = receiptContainerHeader.getLocatingRule(); //定位规则
+        //定位规则
+        String locatingRule = receiptContainerHeader.getLocatingRule();
         if (StringUtils.isEmpty(locatingRule)){
             locatingRule = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()).getLocatingRule();
             //入库单明细定位规则不为空时执行
@@ -127,12 +128,14 @@ public class ReceivingService {
             throw new ServiceException("未绑定定位规则");
         }
         LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(FilterConfigDetail::getCode, locatingRule);
+        lambdaQueryWrapper.eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(FilterConfigDetail::getCode, locatingRule);
         FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(lambdaQueryWrapper);
 
         //根据定位规则查询库位编码
         LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
-        locationLambda.last(filterConfigDetail.getStatement());
+        locationLambda.eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .last(filterConfigDetail.getStatement());
         String locationCode = locationService.getOne(locationLambda).getCode();
         if (locationCode == null){
             throw new ServiceException("没有库位可分配");
diff --git a/src/main/resources/mybatis/task/TaskHeaderMapper.xml b/src/main/resources/mybatis/task/TaskHeaderMapper.xml
index fb2ecc4..b175607 100644
--- a/src/main/resources/mybatis/task/TaskHeaderMapper.xml
+++ b/src/main/resources/mybatis/task/TaskHeaderMapper.xml
@@ -47,7 +47,7 @@
     <select id="getReceiptTask" resultType="java.util.Map">
    SELECT rd.id receiptDetailId,rd.receiptId,td.taskId, td.warehouseCode, td.id taskDetailId, td.status,
                  td.containerCode, td.qty, td.materialCode,rd.totalQty,td.materialSpec,
-					rd.receiptCode,td.inventorySts,
+					rd.receiptCode,rd.inventorySts,
                  td.materialName, rd.batch, rd.lot,
                  rd.manufactureDate, rd.expirationDate
         FROM task_detail td