From fedf2b6cd360fc803a06f67c5dadfc72d357a08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 25 Mar 2024 18:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=8A=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionMain/productionMain.data.ts     | 22 +++++++++++++++++--
 .../productionMainAssemble.data.ts            | 20 ++++++++++++++++-
 .../productionMainAssembleSparePart.data.ts   | 20 ++++++++++++++++-
 .../productionMainPredictSparePart.data.ts    | 22 +++++++++++++++++--
 4 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 3b552367b..0f0444c03 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -77,7 +77,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '车间',
+    label: '机台',
     field: 'workshop',
     sort: 'custom',
     table: {
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index 585255287..d7d82f5b9 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 75a66d8d8..d7bb6a6b6 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 1e21d37e5..7ab3206c9 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -77,7 +77,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '车间',
+    label: '机台',
     field: 'workshop',
     sort: 'custom',
     table: {
@@ -177,6 +177,25 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料代码',
+    field: 'detailItemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '计划数量',
+    field: 'detailPlanQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -287,7 +306,6 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {