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 @@ +