From 17c010f0b782c3fc8d9b8898b62e2a4350a66bcc Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 4 Jul 2022 12:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql     | 4 ++++
 mes/qd/src/views/wms/pdm/produce/workorder/index.vue          | 1 +
 2 files changed, 5 insertions(+)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
index e885f336..3a032c6e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_WORKORDER01.wql
@@ -57,12 +57,14 @@
             	mb.material_name,
             	mb.ext_id,
             	device.device_code,
+            	producmaterialext.old_mark,
             	device.device_name,
             	Formula.create_name AS formula_name,
             	Formula.create_time AS formula_time
             FROM
             	PDM_BI_WorkOrder WorkOrder
             LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id
+            LEFT JOIN md_me_producmaterialext producmaterialext ON mb.material_id = producmaterialext.material_id
             LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id
             LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id and Formula.bucket_type='01' AND Formula.is_delete = '0')
             WHERE
@@ -102,12 +104,14 @@
                 	mb.material_name,
                 	device.device_code,
                 	device.device_name,
+                	producmaterialext.old_mark,
                 	Formula.create_name AS formula_name,
                 	Formula.create_time AS formula_time,
                 	productprocessroutedtl.workprocedure_code AS frist_workprocedure_code
                 FROM
                 	PDM_BI_WorkOrder WorkOrder
                 LEFT JOIN md_me_materialbase mb ON mb.material_id = WorkOrder.material_id
+                 LEFT JOIN md_me_producmaterialext producmaterialext ON mb.material_id = producmaterialext.material_id
                 LEFT JOIN em_bi_deviceinfo device ON device.device_id = WorkOrder.device_id
                 LEFT JOIN PDM_BI_Formula Formula ON (Formula.workorder_id = WorkOrder.workorder_id
                 AND Formula.bucket_type = '01'
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index 1f4d4165..db1b305b 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -212,6 +212,7 @@
         <el-table-column  :formatter="stateFormat" min-width="80" prop="status" label="工令状态" />
         <el-table-column prop="device_name" min-width="100" label="设备"/>
         <el-table-column prop="material_code" min-width="130" label="物料编码"/>
+        <el-table-column prop="old_mark" min-width="80" label="牌号"/>
         <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
         <el-table-column prop="pcsn" min-width="80" label="批次"/>
         <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>