From 70fb9e8014853964c69b8f4449259fd3b49f94cc Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 3 Dec 2024 17:20:41 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B5=B0=E4=B8=9A=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=20=20YT-1391?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/warehouse/index.ts                | 13 ++++++++++
 .../scrap/scrapRequestMain/index.vue          |  3 +--
 .../scrapRequestMain/scrapRequestMain.data.ts | 24 +++++++++----------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
index 4d98aaeea..d0883cda9 100644
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@@ -22,6 +22,19 @@ export const getWarehousePage = async (params) => {
   }
 }
 
+
+// 查询仓库列表
+export const getWarehouseByBusinessTypeSenior = async (params) => {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/warehouse/getWarehouseByBusinessTypeSenior', data })
+}
+
+// 查询仓库列表
+export const getWarehouseByBusinessTypePage = async (params) => {
+    return await request.get({ url: `/wms/warehouse/page`, params })
+}
+
 // 校验仓库
 export const verifyWarehouse = async (params) => {
   return await request.get({ url: `/wms/warehouse/ListByCode`, params })
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index b5512d576..9cb319fb5 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -568,14 +568,13 @@ const openForm = async (type: string, row?: any) => {
       by: 'ASC',
       filters: [
         { column: 'available', action: '==', value: 'TRUE' },
-        { column: 'type', action: '==', value: 'SCRAP' }
       ],
       pageNo: 1,
       pageSize: 500,
       sort: ''
     }
     params.isSearch = true
-    WarehouseApi.getWarehousePage(params).then((res) => {
+    WarehouseApi.getWarehouseByBusinessTypeSenior(params).then((res) => {
       if (res.list?.length > 0) {
         nextTick(() => {
           formRef.value.formRef.setValues({
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 8002b9d5d..f1dee42d1 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -635,18 +635,18 @@ export const ScrapRequestMain = useCrudSchemas(
         searchField: 'code',
         searchTitle: '仓库信息',
         searchAllSchemas: Warehouse.allSchemas,
-        searchPage: WarehouseApi.getWarehousePage,
+        searchPage: WarehouseApi.getWarehouseByBusinessTypePage,
         searchCondition: [
           {
             key: 'available',
             value: 'TRUE',
             isMainValue: false
           },
-          {
-            key: 'type',
-            value: Scrap.outAreaTypes,
-            isMainValue: false
-          }
+          // {
+          //   key: 'type',
+          //   value: Scrap.outAreaTypes,
+          //   isMainValue: false
+          // }
         ],
         verificationParams: [
           {
@@ -668,18 +668,18 @@ export const ScrapRequestMain = useCrudSchemas(
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '仓库信息', // 查询弹窗标题
           searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-          searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+          searchPage: WarehouseApi.getWarehouseByBusinessTypePage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
             },
-            {
-              key: 'type',
-              value: Scrap.outAreaTypes,
-              isMainValue: false
-            }
+            // {
+            //   key: 'type',
+            //   value: Scrap.outAreaTypes,
+            //   isMainValue: false
+            // }
           ],
           verificationParams: [
             {