diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index 3ab55c6cc..9e55c6806 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -186,3 +186,16 @@ export const getFromWarehouseCode = async (code: string) => {
   return await request.get({ url: `/wms/location/getFromWarehouseCode?code=` + code })
 }
 
+
+// 查询库位列表
+export const getLocationListByBusinesstype = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: `/wms/location/getLocationListByBusinesstypeSenior`, data })
+  } else {
+    return await request.get({ url: `/wms/location/getLocationListByBusinesstype`, params })
+  }
+    
+}
+
diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue
index 0228aed64..aa795a718 100644
--- a/src/components/ImportForm/src/ImportFormStep.vue
+++ b/src/components/ImportForm/src/ImportFormStep.vue
@@ -83,7 +83,7 @@
             <Icon icon="ep:download" />
             {{ t('ts.下载模板') }}
           </el-button>
-           <el-button type="primary" plain @click="downloadDifferenceData" v-if="active == 1">
+           <el-button type="primary" plain @click="downloadDifferenceData" v-if="active == 1 && error">
             <Icon icon="ep:download" />
             {{ t('ts.下载差异数据') }}
           </el-button>
diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 1f6ff61d6..2887db8ea 100644
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -717,11 +717,15 @@ export const ExtendColumn = useCrudSchemas(
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '库位信息', // 查询弹窗标题
           searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+          searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法
           searchCondition: [
             {
-              key: 'available',
-              value: 'TRUE',
+              key: 'isIn',
+              value: false,
+              isMainValue: false
+            },{
+              key: 'businessType',
+              value: 'Deliver',
               isMainValue: false
             }
           ]
diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 38fede122..431ea8ea0 100644
--- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -656,11 +656,15 @@ export const ExtendColumn = useCrudSchemas(
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '库位信息', // 查询弹窗标题
           searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+          searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法
           searchCondition: [
             {
-              key: 'available',
-              value: 'TRUE',
+              key: 'isIn',
+              value: false,
+              isMainValue: false
+            },{
+              key: 'businessType',
+              value: 'Deliver',
               isMainValue: false
             }
           ]
diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 2d156119f..3ec168e0e 100644
--- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -713,40 +713,41 @@ export const DeliverRecordDetailRules = reactive({
 
 
 
-export const ExtendColumn = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '从库位',
-      field: 'fromLocationCode',
-      sort: 'custom',
-      table: {
-        colProps: {
-          span: 24
-        }
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '库位信息', // 查询弹窗标题
-          searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      isSearch: true
+export const ExtendColumn = useCrudSchemas([
+  {
+    label: '从库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      colProps: {
+        span: 24
+      }
     },
-    
-  ])
-)
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'isIn',
+            value: false,
+            isMainValue: false
+          },{
+            key: 'businessType',
+            value: 'Deliver',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    isSearch: true
+  }
+])
 
 //表单校验
 export const ExtendColumnRules = reactive({
diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index eda2d2870..e403d426f 100644
--- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -653,11 +653,15 @@ export const ExtendColumn = useCrudSchemas(
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '库位信息', // 查询弹窗标题
           searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+          searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法
           searchCondition: [
             {
-              key: 'available',
-              value: 'TRUE',
+              key: 'isIn',
+              value: false,
+              isMainValue: false
+            },{
+              key: 'businessType',
+              value: 'Deliver',
               isMainValue: false
             }
           ]