diff --git a/public/img/Qrewm.png b/public/img/Qrewm.png
index b96a6747..920d1fae 100644
Binary files a/public/img/Qrewm.png and b/public/img/Qrewm.png differ
diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index c6b25039..e6e60e6a 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -269,7 +269,14 @@ export const $_stockListUnpackDetail = (params) => {
     params
   })
 }
-
+// 查询冻结明细
+export const $_planDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockListInfo/planDetail',
+    method: 'get',
+    params
+  })
+}
 
 
 
diff --git a/src/components/MultiConditionSearch/MultiConditionSearch.vue b/src/components/MultiConditionSearch/MultiConditionSearch.vue
index 0cfd7951..8b60419d 100644
--- a/src/components/MultiConditionSearch/MultiConditionSearch.vue
+++ b/src/components/MultiConditionSearch/MultiConditionSearch.vue
@@ -114,13 +114,6 @@ const destroyWindow = () => {
 };
 
 const dialogSearchSubmit = () => {
-  const lines = localInputValue.value
-    .split('\n') // 按换行分割
-    .map(line => line.trim()) // 移除每一行前后的空格
-    .filter(line => line !== ''); // 过滤掉空行
-
-  const joinedLines = lines.join(','); // 使用逗号连接，无空格
-  localInputValue.value = joinedLines;
   emit('dialogSearchSubmit', localInputValue.value);
 };
 </script>
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 81a294d8..f1dd5ab3 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -1641,7 +1641,7 @@ const onLoad = async () => {
         });
       }
       console.log(endFrom.value, '表单信息');
-      getDeptWarehouse({}).then(res => {
+    await  getDeptWarehouse({}).then(res => {
         // 验证本地仓库用于回复选择，自己不能选择自己仓库
         console.log(res, '处理方');
         console.log(localStorage.getItem('WarehouseName'), '当前本地仓库');
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 2d451f1d..474f3993 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -24,8 +24,7 @@
               <el-icon class="el_dy_icon" @click="openDialog('运单号搜索', query.waybillNum)"
                 ><CirclePlusFilled
               /></el-icon>
-              </div>
-   
+            </div>
           </el-form-item>
 
           <el-form-item label="入库时间:" class="el-times">
@@ -687,12 +686,12 @@
       </template>
     </el-dialog>
 
-  <multi-condition-search
-  v-model:modelValue="dialogVisible"
-    :title="popupTitle"
-    v-model:inputValue="searchInput"
-    @dialogSearchSubmit="handleSearchSubmit"
-  />
+    <MultiConditionSearch
+      v-model:modelValue="dialogVisible"
+      :title="popupTitle"
+      v-model:inputValue="searchInput"
+      @dialogSearchSubmit="handleSearchSubmit"
+    />
   </basic-container>
   <edittablehead
     @closce="showdrawer"
@@ -737,7 +736,7 @@ const _newCol = deepClone(columnList);
 
 export default {
   components: {
-    MultiConditionSearch
+    MultiConditionSearch,
   },
   data() {
     return {
@@ -1505,25 +1504,32 @@ export default {
       }
     },
 
-    openDialog(title, input) {
+    async openDialog(title, input) {
       this.popupTitle = title;
-      console.log(input, 'input');
+      console.log(input, '输入框值1');
       if (input) {
-        const formattedInput = input.split(',').join('\n');
+        const formattedInput = await input.split(',').join('\n');
+        console.log(formattedInput, '输入框值2');
+
         this.searchInput = formattedInput; // 赋值给 inputAll
       } else {
         this.searchInput = '';
-      
-        
       }
-      console.log(this.searchInput,'输入框值');
+      console.log(this.searchInput, '输入框值3');
       this.dialogVisible = true;
     },
     handleSearchSubmit(value) {
+      const lines = value
+        .split('\n') // 按换行分割
+        .map(line => line.trim()) // 移除每一行前后的空格
+        .filter(line => line !== ''); // 过滤掉空行
+
+      const joinedLines = lines.join(','); // 使用逗号连接，无空格
+
       if (this.popupTitle == '订单自编号搜索') {
-        this.query.orderCodeNum = value; //搜索框值
-      }else if(this.popupTitle == '运单号搜索'){
-        this.query.waybillNum = value; //搜索框值
+        this.query.orderCodeNum = joinedLines; //搜索框值
+      } else if (this.popupTitle == '运单号搜索') {
+        this.query.waybillNum = joinedLines; //搜索框值
       }
       this.dialogVisible = false;
     },
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index d2f0f3b5..a85c8bc3 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -236,6 +236,36 @@
               </el-pagination>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="冻结明细" name="FreezeDetails">
+            <tablecmt
+              class="tableNode"
+              :columnList="columnListarrs.FreezeDetails"
+              :tableData="data4"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps">
+              </template>
+            </tablecmt>
+            <!-- <div class="avue-crud__pagination" style="width: 100%">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page4.currentPage"
+                :page-sizes="[200, 250, 300, 500]"
+                :page-size="page3.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page3.total"
+              >
+              </el-pagination>
+            </div> -->
+          </el-tab-pane>
           <!--  <el-tab-pane label="拆包记录" name="unpacking">
             <el-table ref="table" v-loading="loading"
                       @selection-change="selectionChange"
@@ -314,6 +344,7 @@ import {
   showInventorySourcePackageCode,
   $_cancelAddStockListByPackage,
   $_stockListUnpackDetail,
+  $_planDetail,
   $_cancelUnpack,
   $_showInventoryPackgeCodes,
 } from '@/api/distribution/distributionStockList';
@@ -332,7 +363,83 @@ export default {
       locations: 0, //货位总数
       isShowPrint: false,
       html: '',
+      
       columnListarrs: {
+        
+        // 冻结明细
+        FreezeDetails:[
+        {
+            prop: '',
+            label: '复选框',
+            type: 0,
+            width: 55,
+            fixed: true,
+          },
+        {
+            prop: '',
+            label: '序号',
+            type: 12,
+            values: '',
+            width: 55,
+            fixed: true,
+          },
+          {
+            prop: 'consignee',
+            label: '收货人',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'packageCode',
+            label: '包条码',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'planNum',
+            label: '计划数量',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+            isshowSummary: true,
+          },
+          {
+            prop: 'reservationCode',
+            label: '任务单号',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'scanUser',
+            label: '备货人',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+        ],
         //入库明细
         columnWarehousing: [
           {
@@ -917,6 +1024,11 @@ export default {
         pageSize: 200,
         total: 0,
       },
+      page4: {
+        currentPage: 1,
+        pageSize: 200,
+        total: 0,
+      },
       // 表单数据
       form: {},
       // 选择行
@@ -928,6 +1040,7 @@ export default {
       data1: [],
       data2: [],
       data3: [],
+      data4: [],
       leibiao: '',
       loadingObj: {
         pageLoading: false,
@@ -1100,10 +1213,35 @@ export default {
         console.log('拆包明细');
         // this.getOnChai(this.page2);
         this.getunpacking(this.page3);
+      }else if (this.leibiao == 'FreezeDetails') {
+        this.getFreezeDetails(this.page4);
       }
       const _node = document.querySelectorAll('.tableNode');
       setNodeHeight(_node, '', true);
     },
+    getFreezeDetails(page){
+      let data = {
+        stockListId: this.$route.query.id,
+        // current: page.currentPage,
+        // size: page.pageSize,
+      };
+      this.loading = true;
+      $_planDetail(data)
+        .then(res => {
+          console.log(res, '拆单明细');
+          if (res.data.code == 200) {
+            this.data4 = res.data.data;
+            // this.page4.total = res.data.data.total;
+            console.log(this.page4, ' this.page4');
+          }
+        })
+        .catch(res => {
+          console.log(res, '错误');
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     // 查询拆包
     getunpacking(page) {
       let data = {
diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
index 84d8d03a..7ea163c0 100644
--- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
+++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
@@ -136,7 +136,6 @@ import {
   $_signforList,
   $_signforDistributionStockArticleList,
 } from '@/api/distribution/distributionStockArticle.js';
-import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 const $router = useRouter(); //跳转
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 58552a90..bddcec9d 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -485,8 +485,14 @@ const openDialog = (title, input) => {
   dialogVisible.value = true;
 };
 const handleSearchSubmit = value => {
+  const lines = value
+        .split('\n') // 按换行分割
+        .map(line => line.trim()) // 移除每一行前后的空格
+        .filter(line => line !== ''); // 过滤掉空行
+
+      const joinedLines = lines.join(','); // 使用逗号连接，无空格
   if (popupTitle.value == '运单号搜索') {
-    query.value.waybillNoList = value; //搜索框值
+    query.value.waybillNoList = joinedLines; //搜索框值
   }
   dialogVisible.value = false;
 };
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 228d6c6b..23a61252 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -58,7 +58,7 @@
             <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
               批量打印
             </el-button>
-            <el-button @click="openDialog">打开搜索弹窗</el-button>
+            <!-- <el-button @click="openDialog">打开搜索弹窗</el-button> -->
             <!-- 批量入库 -->
             <el-button
               type="primary"