From d5a867fba46d464c247856a50959195bd7aebf3c Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 27 Aug 2024 14:17:03 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5665=20=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   | 24 ++++++++++++-------
 .../scrapRecordMain/scrapRecordMain.data.ts   | 24 ++++++++++++-------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index eb2d25e55..d0f7bcb28 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -169,6 +169,14 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '订单号',
+      field: 'orderNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -887,14 +895,14 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index c16321c8e..520aa838a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -178,6 +178,14 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '订单号',
+      field: 'orderNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -698,14 +706,14 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',