From 256aea309b7571f82001337547ce32414bf7f2de Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 21 Aug 2024 15:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F=E4=B8=8D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                                      | 4 ++--
 src/locales/zh-CN.ts                                      | 3 ++-
 .../sparereceipt/sparereceiptRequestMain/index.vue        | 8 ++++++++
 .../sparereceiptRequestMain.data.ts                       | 5 ++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index dc2d547ea..6a2b61a71 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1280,8 +1280,8 @@ export default {
     规则配置:'Rule configuration',
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
-    '确认撤销报工吗？':'Are you sure to cancel the job application?',
-
+    '确认撤销报工吗？': 'Are you sure to cancel the job application?',
+    '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity'
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 43f0afa23..8a8b4a545 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1276,7 +1276,8 @@ export default {
     规则配置:'规则配置',
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
-    '确认撤销报工吗？':"确认撤销报工吗？",
+    '确认撤销报工吗？': "确认撤销报工吗？",
+    '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量'
   },
 
 }
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index d738b2fc8..e464f8937 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -238,6 +238,7 @@ const updateTableData = (tableList)=>{
     newRow['uom'] = row['uom']
     newRow['poNumber'] =row['number']
     newRow['supplierCode'] =row['supplierCode']
+    newRow['qty'] =row['orderQty']
     //生产日期 到货日期 默认当天
     newRow['produceDate'] = dayjs().valueOf()
     newRow['arriveDate'] = dayjs().valueOf()
@@ -600,6 +601,13 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let isThen = tableData.value.some(item => {
+    return parseFloat(item.qty) > parseFloat(item.orderQty)
+  })
+  if(isThen){
+      message.error(t('ts.收货数量不可以大于订单数量!'))
+    return;
+  }
   data.subList = tableData.value // 拼接子表数据参数
   formRef.value.formLoading = true
   try {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index fd3e60289..7356875d3 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -18,7 +18,7 @@ const { t } = useI18n() // 国际化
 const queryParams = {
   pageSize:10,
   pageNo:1,
-  code:'PurchaseReceiptRequest'
+  code:'PurchaseReceiptSpareRequest'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
@@ -465,7 +465,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
+    isForm: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -477,7 +477,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled: true,
       }
     }
   },