diff --git a/src/main/java/com/huaheng/framework/config/ShiroConfig.java b/src/main/java/com/huaheng/framework/config/ShiroConfig.java
index ee34d4a..3e0bc21 100644
--- a/src/main/java/com/huaheng/framework/config/ShiroConfig.java
+++ b/src/main/java/com/huaheng/framework/config/ShiroConfig.java
@@ -276,11 +276,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/mobile/receipt/batch/**", "anon");
 
         //todo pda出入库查询，测试后注释
-        //filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
-        //filterChainDefinitionMap.put("/receipt/receiptDetail/list", "anon");
-        //filterChainDefinitionMap.put("/task/taskHeader/getTaskByTaskId", "anon");
-        //filterChainDefinitionMap.put("/task/taskHeader/getTaskByShipmentCode", "anon");
-        //filterChainDefinitionMap.put("/mobile/inventory/completeTaskListByWMS", "anon");
+        filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
+        filterChainDefinitionMap.put("/receipt/receiptDetail/list", "anon");
+        filterChainDefinitionMap.put("/task/taskHeader/getTaskByTaskId", "anon");
+        filterChainDefinitionMap.put("/task/taskHeader/getTaskByShipmentCode", "anon");
+        filterChainDefinitionMap.put("/mobile/inventory/completeTaskListByWMS", "anon");
 
 
         // 系统权限列表
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java b/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
index c7f6c4a..66a10b2 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
@@ -383,6 +383,12 @@ public class TaskHeaderController extends BaseController {
         if (StringUtils.isEmpty(shipmentCode)) {
             return AjaxResult.error("单据号为空！");
         }
+        List<TaskDetail> RecordCodeTaskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
+                .eq(StringUtils.isNotEmpty(zoneCode), TaskDetail::getZoneCode, zoneCode).eq(TaskDetail::getRecordCode, shipmentCode));
+        if (!RecordCodeTaskDetails.isEmpty()) {
+            return AjaxResult.error("请扫描合并单据号:" + shipmentCode);
+        }
+
         List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
                 .eq(StringUtils.isNotEmpty(zoneCode), TaskDetail::getZoneCode, zoneCode).eq(TaskDetail::getBillCode, shipmentCode));
         if (taskDetails.isEmpty()) {