From f94f72f7b3287a3232488cabc952352f2e1ca65f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 25 Oct 2024 11:23:49 +0800
Subject: [PATCH] =?UTF-8?q?HL-6310WMS=20=E5=88=B6=E5=93=81=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/subject/mstr/index.vue    |  1 +
 .../productputawayRequestMain.data.ts         | 10 ++++++
 .../productputawayAssembleRequestMain.data.ts | 32 +++++++++++++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
index 616377da4..b49fba76e 100644
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -68,6 +68,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 产品类
 defineOptions({ name: 'Mstr' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index f315502ab..2e77791d8 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -475,6 +475,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'businessType',
         value: businessTypeData.code,
+      },
+      {
+        key: 'inOrOut',
+        value: 'out',
+        isMainValue: false
       }]
     },
     form: {
@@ -489,6 +494,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'businessType',
           value: businessTypeData.code,
+        },
+        {
+          key: 'inOrOut',
+          value: 'out',
+          isMainValue: false
         }]
       }
     }
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 006fc1ecf..3acc8dc13 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -4,6 +4,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
 
 import { TableColumn } from '@/types/table'
 
@@ -18,6 +19,7 @@ const queryParams = {
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
 
+ 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -26,6 +28,14 @@ const userDept = userStore.userSelfInfo.dept
  userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
+const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductPutaway'
+}
+const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+const businessTypeData =businessTypeValue?.list[0]||{}
+
 /**
  * @returns {Array} 制品上架申请主表
  */
@@ -463,7 +473,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      },
+      {
+        key: 'inOrOut',
+        value: 'out',
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -473,7 +492,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-        searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        },
+        {
+          key: 'inOrOut',
+          value: 'out',
+          isMainValue: false
+        }]
       }
     }
   },