From 614939080f0208aa6ba143b9b25ab46d9e1b0a70 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 21 Feb 2024 17:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierdeliverRecordMain/index.ts    |  7 ++++++
 .../inspect/inspectRecordMain/index.vue       | 22 +++++++++----------
 .../supplierdeliverRecordMain/index.vue       | 18 ++++++++++++++-
 .../supplierdeliverRequestMain/index.vue      | 10 +++++++--
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/api/wms/supplierdeliverRecordMain/index.ts b/src/api/wms/supplierdeliverRecordMain/index.ts
index c205031cc..e67f3b5a6 100644
--- a/src/api/wms/supplierdeliverRecordMain/index.ts
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@@ -31,6 +31,8 @@ export interface SupplierdeliverRecordMainVO {
   creator: string
   serialNumber: string
   available: string
+  purchasereceiptRequestFlag: boolean
+  purchasereceiptRequestNumber: string
 }
 
 // 查询供应商发货记录主列表
@@ -77,4 +79,9 @@ export const exportSupplierdeliverRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-record-main/get-import-template' })
+}
+
+// 创建采购申请
+export const createPurchasereceiptRequest = async (number:string) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index facd5be89..5f867c3e1 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -143,18 +143,18 @@ const buttonTableClick = async (val, row) => {
 }
 
 
-  /** 生成采购上架申请按钮操作 */
-  const handlePutawayRequest = async (number:string) => {
-    try{
-      await message.confirm(t('确认生成上架申请吗？'))
-      tableObject.loading = true
-      await InspectRecordMainApi.createPutAwayRequest(number)
-      message.success(t('上架申请生成成功'))
-      await getList()
-    }catch{}finally{
-      tableObject.loading = false
-    }
+/** 生成采购上架申请按钮操作 */
+const handlePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await InspectRecordMainApi.createPutAwayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
   }
+}
 
 /** 详情操作 */
 const detailRef = ref()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index a1d4b1e7d..081ffc15d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -127,12 +127,28 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请
+     defaultButtons.mainListGenerateApplicationBtn({hasPermi:'wms:supplierdeliver-record-main:createPurchasereceiptRequest',hide:!row.purchasereceiptRequestFlag}), // 生成采购申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'generateApplication'){
+    handlerCreatePurchasereceiptRequest(row.number)
+  }
+}
+
+/** 生成采购收货申请按钮操作 */
+const handlerCreatePurchasereceiptRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成采购申请吗？'))
+    tableObject.loading = true
+    await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
+    message.success(t('采购申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index a39d843d3..69a89b80c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -105,6 +105,7 @@ import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequest
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
+import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
 
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
@@ -465,8 +466,13 @@ const genRecords = async (id: number) => {
     await message.confirm('是否处理所选中数据？')
     tableObject.loading = true
     // 发起处理
-    await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
-    message.success(t('处理成功!'))
+    await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
+      message.success(t('处理成功!'))
+      if(!res){
+        SupplierdeliverRecordMainApi.createPurchasereceiptRequest(res.number)
+        message.success(t('采购申请生成成功'))
+      }
+    })
     // 刷新列表
     await getList()
   } catch {}finally{