From 9363a7487cf9548f557e677a966e98d10d13be19 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 24 Sep 2024 10:46:49 +0800
Subject: [PATCH] =?UTF-8?q?HL-6112=E9=9A=94=E7=A6=BB=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=97=B62=E4=B8=AA=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9B=B8=E5=90=8C=E7=9A=84=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E7=94=9F=E6=88=902=E4=B8=AA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain/index.vue             | 9 +++++++++
 .../productreceiptscrapRequestMain.data.ts               | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index e57b2268b..fbc619e43 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -695,6 +695,15 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let messageList = []
+  detatableData.tableList.forEach(item=>{
+    if(item['packUnit'] == item['secondPackUnit']){
+      messageList.push(item['itemCode'])
+    }
+  })
+  if(messageList.length>0){
+    message.error(`物料${messageList.join(',')}包装规格1和包装规格2不能相同`)
+  }
   try {
     detatableData.tableList.forEach(async (item) => {
       // 创建标签 要物料库区配置表中 入库包装规格
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 951cf42af..6ae43110c 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -2074,6 +2074,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
 
 //表单校验
 export const ProductreceiptRequestLabelRules = reactive({
+  secondPackUnit: [
+    { required: true, message: '请选择包装规格2', trigger: 'change' }
+  ],
   supplierItemCode: [
     { required: true, message: '请选择供应商', trigger: 'change' }
   ],