From 3acd851ea47dc100eac96af8c8affd226fbea3b4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 27 Aug 2024 09:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                           |  1 +
 src/locales/zh-CN.ts                           |  1 +
 .../supplierdeliverBasicForm.vue               | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index b05f796e8..cc916eb4c 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1283,6 +1283,7 @@ export default {
     '确认撤销报工吗？': 'Are you sure to cancel the job application?',
     '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity',
     撤销报工成功:'Revocation of work report successful',
+    生产日期不能小于:'The date of production cannot be less than'
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 2387dbe25..b0ab60a46 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1279,6 +1279,7 @@ export default {
     '确认撤销报工吗？': "确认撤销报工吗？",
     '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量',
     撤销报工成功:'撤销报工成功',
+    生产日期不能小于:'生产日期不能小于'
   },
 
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index c2cca72bb..6e1efa992 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -208,7 +208,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow['planQty'] = item['planQty']
         newRow['shippedQty'] = item['shippedQty']
         newRow['qty'] = item['planQty'] - item['shippedQty']
-        newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
+        newRow['minProduceDate'] = item['minProduceDate'] // 最小生产日期
+        newRow['produceDate'] = dayjs().valueOf() // 是否允许超发        
         let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
         newRow['batch'] = produceDateStr
         newRow['supplierBatch'] = produceDateStr
@@ -289,6 +290,7 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{
     newRow['planQty'] = row['planQty']
     newRow['shippedQty'] = row['shippedQty']
     newRow['qty'] = row['planQty'] - row['shippedQty']
+    newRow['minProduceDate'] = row['minProduceDate'] // 最小生产日期
     newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
     let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
     newRow['batch'] = produceDateStr
@@ -319,6 +321,16 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let flag = true
+  tableData.value.forEach(item=>{
+    if(item['minProduceDate']&&item['produceDate']<item['minProduceDate']){
+      flag = false
+      message.error(`${item['itemCode']}${t('ts.生产日期不能小于')}${formatDate(item['minProduceDate'],'YYYYMMDD')}`)
+    }
+  })
+  if(!flag){
+    return
+  }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
     console.log("CCCCC",item.expireDate)
@@ -415,6 +427,10 @@ const inputNumberChange = (field, val,row, index) => {
 const formFormDateChange = (field, val,row, index) => {
   console.log('formFormDateChange',field, val,row, index)
   if(field == 'produceDate'){
+    if(row['minProduceDate']&&val<row['minProduceDate']){
+      message.error(`${row['itemCode']}${t('ts.生产日期不能小于')}${formatDate(row['minProduceDate'],'YYYYMMDD')}`)
+      val = row['minProduceDate']
+    }
     let produceDateStr = formatDate(val,'YYYYMMDD');
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr