diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
index 7bd4a687..a99ec411 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
@@ -84,25 +84,24 @@
     IF 输入.flag = "2"
         PAGEQUERY
             SELECT
-            	pp.*, ext.old_mark,
-            	ext.standard_weight_pft AS standard_weight,
-            	materialbase.material_type_id,
-            	ext.product_series,
-            	deviceinfo.device_id,
-            	deviceinfo.device_name
+             pp.*,
+             ext.old_mark,
+             ext.standard_weight_pft AS standard_weight,
+             materialbase.material_type_id,
+             ext.product_series,
+            deviceinfo.device_id,
+             deviceinfo.device_name
             FROM
-            	PCS_IF_ProductPlanProc pp
-            LEFT JOIN MD_ME_ProducMaterialExt ext ON pp.material_id = ext.material_id
-            LEFT JOIN md_me_materialbase materialbase ON pp.material_id = materialbase.material_id
-            LEFT JOIN MPS_BD_CapacityTemplateWorkDevice WorkDevice ON (
-            	WorkDevice.captemplate_id = '1534741977764073472'
-            	AND WorkDevice.workprocedure_id = '1472449923327856640'
-            	AND WorkDevice.product_series_id = ext.product_series
-            )
-            LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkDevice.device_id
+             PCS_IF_ProductPlanProc pp
+             LEFT JOIN md_me_materialbase materialbase ON pp.material_id = materialbase.material_id
+             LEFT JOIN MD_ME_ProducMaterialExt ext ON pp.material_id = ext.material_id
+             INNER JOIN MPS_BD_CapacityTemplateWorkDevice WorkDevice ON concat(ext.product_series) = concat(WorkDevice.product_series_id)
+              LEFT JOIN em_bi_deviceinfo deviceinfo ON deviceinfo.device_id = WorkDevice.device_id
             WHERE
-            	1 = 1
-            AND pp.is_proc IN ('1', '2')
+             1 = 1
+             AND pp.is_proc IN ( '1', '2' )
+               AND WorkDevice.captemplate_id = '1534741977764073472'
+              AND WorkDevice.workprocedure_id = '1472449923327856640'
                 OPTION 输入.is_proc <> ""
                         pp.is_proc = 输入.is_proc
                 ENDOPTION