From 59e32082082e42171ba373522e5b83aecd0024eb Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 23 Aug 2024 15:47:22 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5517=20WMS=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E7=AE=A1=E7=90=86-=E9=9A=94=E7=A6=BB=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain.data.ts       | 22 +++++--------------
 .../productionreturnRequestMainNo.data.ts     | 22 +++++--------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 9c5da4822..947edf4e6 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1195,6 +1195,12 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -1355,22 +1361,6 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       }
     }
   },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '来源工位代码',
     field: 'workStationCode',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 4b2658f20..4ba1b9e1f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -706,6 +706,12 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -856,22 +862,6 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       }
     }
   },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '来源工位代码',
     field: 'workStationCode',