From 361d1ef664094802852b8b6d89123a6940087964 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 22 Feb 2024 17:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inspectRecordMain/index.ts        |  2 +-
 .../wms/purchasereceiptRecordMain/index.ts    | 14 ++++++++
 .../purchasereceiptRecordMain/index.vue       | 34 +++++++++++++++++--
 .../purchasereceiptRecordMain.data.ts         | 10 ++++++
 .../supplierdeliverRequestMain/index.vue      |  9 ++---
 5 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/api/wms/inspectRecordMain/index.ts b/src/api/wms/inspectRecordMain/index.ts
index 2e8f09b9f..3de2e0b1f 100644
--- a/src/api/wms/inspectRecordMain/index.ts
+++ b/src/api/wms/inspectRecordMain/index.ts
@@ -90,5 +90,5 @@ export const importTemplate = () => {
 
 // 创建上架申请
 export const createPutAwayRequest = async (number:string) => {
-  return await request.post({ url: `/wms/inspect-record-main/createPutAwayRequest?number=`+number })
+  return await request.post({ url: `/wms/inspect-record-main/createPutAwayRequestPC?number=`+number })
 }
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts
index fb50c380b..9fab97c09 100644
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@@ -31,6 +31,10 @@ export interface PurchasereceiptRecordMainVO {
   fromAreaCodes: string
   toAreaCodes: string
   available: string
+  putawayRequestFlag: boolean
+  putawayRequestNumber: string
+  inspectRequestFlag: boolean
+  inspectRequestNumber: string
 }
 
 // 查询采购收货记录主列表
@@ -77,4 +81,14 @@ export const exportPurchasereceiptRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' })
+}
+
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dd7691443..3990e757e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -125,14 +125,44 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceiptRecordMain:inspectRequest'}), // 生成到货检验申请
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),// 生成采购上架申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'putawayRequest') { // 生成采购上架申请
-    handleExport()
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index a3d89d47f..397a6a4ed 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -333,6 +333,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
   }
 ]))
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 69a89b80c..d0c354779 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -466,13 +466,8 @@ const genRecords = async (id: number) => {
     await message.confirm('是否处理所选中数据？')
     tableObject.loading = true
     // 发起处理
-    await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
-      message.success(t('处理成功!'))
-      if(!res){
-        SupplierdeliverRecordMainApi.createPurchasereceiptRequest(res.number)
-        message.success(t('采购申请生成成功'))
-      }
-    })
+    await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+    message.success(t('处理成功!'))
     // 刷新列表
     await getList()
   } catch {}finally{