质量，个人、工序、欠点、汇总的缺陷取质量登记和功能检测的数据

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -94,7 +94,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                          AND pd28c.kilncarbatchno = pd.kilncarbatchno
                                                          AND pd28c.productiondataid > pd.productiondataid
                                                          AND pd28c.productiondataid < pds.productiondataid)
-                                  LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid = nvl(pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
+                                  LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
                                   LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND (   MDF.DEFECTCODE in('01','02','03','04','05','06','07','08','09','10','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','001','002','099','99','1' ,'2' ,'3' ) )
                                   LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
                                   LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
@@ -191,7 +191,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                          AND pd28c.kilncarbatchno = pd.kilncarbatchno
                                                          AND pd28c.productiondataid > pd.productiondataid
                                                          AND pd28c.productiondataid < pds.productiondataid)
-                                  LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid = nvl(pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
+                                  LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
                                   LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND ( MDF.DEFECTCODE in('01','02','03','04','05','06','07','08','09','10','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','001','002','099','99','1' ,'2' ,'3' ) )
                                   LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
                                   LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -81,6 +81,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                        , pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -137,7 +138,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID" ;
-                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @" LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND  MDF.DEFECTCODE IN( '01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35' ) ";
                 sqlStr += @"  GROUP BY Grouping sets ( (GD.GOODSCODE ,
                                                         GD.GOODSNAME,
@@ -169,6 +170,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                        , pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -225,7 +227,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN( '01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35' )     ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -83,6 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                        ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -139,7 +140,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID" ;
-                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @" LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND  MDF.DEFECTCODE IN( '10', '12', '13', '14', '15', '16', '17', '18', '19','23','25','35' ) ";
                 sqlStr += @"  GROUP BY Grouping sets ( (GD.GOODSCODE ,
                                                         GD.GOODSNAME,
@@ -171,6 +172,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -227,7 +229,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN( '10', '12', '13', '14', '15', '16', '17', '18', '19','23','25','35' )     ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -84,6 +84,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -140,7 +141,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID" ;
-                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @" LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND  MDF.DEFECTCODE IN( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10',  '28', '34', '35' ) ";
                 sqlStr += @"  GROUP BY Grouping sets ( (GD.GOODSCODE ,
                                                         GD.GOODSNAME,
@@ -172,6 +173,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -228,7 +230,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10',  '28', '34', '35' )     ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -81,6 +81,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -137,7 +138,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID" ;
-                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @" LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTID IN (
                           SELECT  DISTINCT     MDF.DEFECTID
                               FROM TP_MST_DEFECT MDF
@@ -172,6 +173,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -228,7 +230,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN (61, 28) ";
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN ( '47','48','49','50','51','52','53','54','55','56','20','57')      ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -89,6 +89,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -147,7 +148,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN(" + defectcode + ") AND DF.VALUEFLAG=1";
                 sqlStr += @"    GROUP BY  Grouping sets ( (GD.GOODSCODE ,
                                                         GD.GOODSNAME,
@@ -179,6 +180,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                      ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -235,7 +237,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN(" + defectcode + ") AND DF.VALUEFLAG=1   ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect);

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -92,6 +92,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -148,7 +149,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID" ;
-                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr += @" LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @" LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND  MDF.DEFECTCODE IN(" + defectcode + ") ";
                 sqlStr += @"  GROUP BY Grouping sets ( (GD.GOODSCODE ,
                                                         GD.GOODSNAME,
@@ -180,6 +181,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -236,7 +238,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN(" + defectcode + ")     ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -93,6 +93,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -149,7 +150,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr +=@"      LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr +=@"      LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @"		LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND  MDF.DEFECTCODE IN(" + defectcode + ")";
                 sqlStr += @"     GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
@@ -182,6 +183,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                        ,pd.procedureid AS procedureid
                                        ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                        ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                       ,pd.productiondataid  fproductiondataid
                                        ,pd.createtime
                                        ,pd.logoid
                           FROM (SELECT *
@@ -238,7 +240,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID " ;
-                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON PD.productiondataid = DF.productiondataid    AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
+                sqlStr += @"LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;
                 sqlStr += @"LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE IN(" + defectcode + ") AND DF.VALUEFLAG=1   ) ORDER BY GID ";
                                   
                  sqlStr = sqlStr.Replace("{DEFECT}", defect).Replace("{DEFECTSUM}",sumdefect); 

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -73,7 +73,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID 
-                                LEFT JOIN TP_PM_DEFECT DF ON NVL(PD61.PRODUCTIONDATAID, PD.PRODUCTIONDATAID) = DF.PRODUCTIONDATAID  AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
+                                LEFT JOIN TP_PM_DEFECT DF ON  DF.PRODUCTIONDATAID in (PD61.PRODUCTIONDATAID, PD.PRODUCTIONDATAID) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
                                 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE in('87','88','086','86')
                                 WHERE
 	                                PD.PROCEDUREID IN ( 16) 
@@ -123,7 +123,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID 
-                                LEFT JOIN TP_PM_DEFECT DF ON NVL(PD61.PRODUCTIONDATAID, PD.PRODUCTIONDATAID) = DF.PRODUCTIONDATAID  AND DF.VALUEFLAG=1
+                                LEFT JOIN TP_PM_DEFECT DF ON   DF.PRODUCTIONDATAID in  (PD61.PRODUCTIONDATAID, PD.PRODUCTIONDATAID)  AND DF.VALUEFLAG=1
                                 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTCODE in('87','88','086','86')
 									WHERE
 	                                PD.PROCEDUREID =16

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -111,7 +111,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID  AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid = nvl(pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
+                                        	LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pds.productiondataid, pd.productiondataid) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN(61,28)
                                             LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND ( MDF.DEFECTCODE in('01','02','03','04','05','06','07','08','09','10','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','001','002','099','99','1' ,'2' ,'3' ) )
                                         	LEFT JOIN TP_MST_USER us ON us.USERID=gdl.USERID
 											LEFT JOIN TP_MST_USERSTAFF us ON us.USERID=gdl.USERID

wwwroot/mes/rpt/rpt212/rpt.ashx

@@ -154,7 +154,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                         LEFT JOIN tp_mst_logo lg
                                                           ON pd.logoid = lg.logoid
                                                         LEFT JOIN tp_pm_defect df
-                                                          ON df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid)
+                                                          ON df.productiondataid in (pd61.productiondataid, pd.productiondataid)
                                                          AND df.defectcode IN ('10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35')                  
                                                          AND df.valueflag = 1
                                                          AND df.procedureid NOT IN (61, 28)

wwwroot/mes/rpt/rpt213/rpt.ashx

@@ -152,7 +152,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 														LEFT JOIN tp_mst_logo lg
 														  ON pd.logoid = lg.logoid
 														LEFT JOIN tp_pm_defect df
-														  ON df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid)
+														  ON df.productiondataid in (pd61.productiondataid, pd.productiondataid)
 														 AND df.defectcode IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35')                  
 														 AND df.valueflag = 1
 														 AND df.procedureid NOT IN (61, 28)

wwwroot/mes/rpt/rpt214/rpt.ashx

@@ -133,7 +133,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON  df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid) 
+                                        	LEFT JOIN TP_PM_DEFECT DF ON  df.productiondataid in (pd61.productiondataid, pd.productiondataid) 
 											AND DF.DEFECTCODE IN (SELECT DISTINCT  MDF.DEFECTCODE
 											FROM TP_MST_DEFECT MDF where MDF.VALUEFLAG=1 AND MDF.DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35') ) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN  (61, 28) ";
                 sqlStr += @"					LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -168,7 +168,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                             LEFT JOIN tp_mst_logo lg
                                               ON pd.logoid = lg.logoid
                                             LEFT JOIN tp_pm_defect df
-                                             ON df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid)
+                                             ON df.productiondataid in (pd61.productiondataid, pd.productiondataid)
                                              AND df.defectcode IN (SELECT DISTINCT mdf.defectcode
                                                                      FROM tp_mst_defect mdf
                                                                     WHERE defecttypeid = 4)

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -169,7 +169,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                             LEFT JOIN tp_mst_logo lg
                                               ON pd.logoid = lg.logoid
                                             LEFT JOIN tp_pm_defect df
-                                             ON df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid)
+                                             ON df.productiondataid in (pd61.productiondataid, pd.productiondataid)
                                              AND df.defectcode IN (SELECT DISTINCT mdf.defectcode
                                                                      FROM tp_mst_defect mdf
                                                                     WHERE defecttypeid = 5 OR mdf.defectcode = '20')

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -148,7 +148,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON   df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid)   AND DF.DEFECTCODE IN(" + defectcode + ") AND DF.VALUEFLAG=1 AND DF.PROCEDUREID NOT IN"+notInproc+"";
+                                        	LEFT JOIN TP_PM_DEFECT DF ON   df.productiondataid in (pd61.productiondataid, pd.productiondataid)   AND DF.DEFECTCODE IN(" + defectcode + ") AND DF.VALUEFLAG=1 AND DF.PROCEDUREID NOT IN"+notInproc+"";
                 sqlStr +=@"                  LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 
                                             LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PD.CLASSESSETTINGID
                                             LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -149,7 +149,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON  df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid) 
+                                        	LEFT JOIN TP_PM_DEFECT DF ON  df.productiondataid in (pd61.productiondataid, pd.productiondataid) 
 											AND DF.DEFECTCODE IN (SELECT DISTINCT  MDF.DEFECTCODE
 											FROM TP_MST_DEFECT MDF where MDF.VALUEFLAG=1 AND MDF.DEFECTCODE IN(" + defectcode + ") ) AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN" + notInproc + "";
                 sqlStr += @"					LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -148,7 +148,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid = nvl(pd61.productiondataid, pd.productiondataid) AND DF.DEFECTID IN (
+                                        	LEFT JOIN TP_PM_DEFECT DF ON df.productiondataid in (pd61.productiondataid, pd.productiondataid) AND DF.DEFECTID IN (
 													SELECT  DISTINCT 		 MDF.DEFECTID
 															 FROM TP_MST_DEFECT MDF
 															where MDF.DEFECTCODE IN("+defectcode+") )  	AND DF.VALUEFLAG=1  AND DF.PROCEDUREID NOT IN"+notInproc;

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -82,6 +82,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 														 ,pd1.barcode
 														 ,pd1.valueflag 
 														 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+														 ,pd1.productiondataid  fproductiondataid
 											FROM (SELECT *
 													FROM (SELECT pd28.goodsname
 																,pd28.groutingdailydetailid
@@ -125,7 +126,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 													 AND pd28c.productiondataid > pd1.productiondataid
 													 AND pd28c.productiondataid < pd61.productiondataid)) pd
-								  ON pd.productiondataid = df.productiondataid
+								  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
@@ -311,6 +312,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 														 ,pd1.barcode
 														 ,pd1.valueflag 
 														 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+													     ,pd1.productiondataid  fproductiondataid
 											FROM (SELECT *
 													FROM (SELECT pd28.goodsname
 																,pd28.groutingdailydetailid
@@ -354,9 +356,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 													 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 													 AND pd28c.productiondataid > pd1.productiondataid
 													 AND pd28c.productiondataid < pd61.productiondataid)) pd
-								  ON pd.productiondataid = df.productiondataid
-
-
+								  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
 									LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 
@@ -1048,6 +1048,7 @@ ORDER BY 产品类别,产品编码";
 														 ,pd1.barcode
 														 ,pd1.valueflag 
 														 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+														 ,pd1.productiondataid  fproductiondataid
 											FROM (SELECT *
 													FROM (SELECT pd28.goodsname
 																,pd28.groutingdailydetailid
@@ -1091,7 +1092,7 @@ ORDER BY 产品类别,产品编码";
 													 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 													 AND pd28c.productiondataid > pd1.productiondataid
 													 AND pd28c.productiondataid < pd61.productiondataid)) pd
-								  ON pd.productiondataid = df.productiondataid
+								  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 									INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE AND pds.valueflag = 1
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
@@ -1293,6 +1294,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 														 ,pd1.barcode
 														 ,pd1.valueflag 
 														 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+														 ,pd1.productiondataid  fproductiondataid
 											FROM (SELECT *
 													FROM (SELECT pd28.goodsname
 																,pd28.groutingdailydetailid
@@ -1336,7 +1338,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 													 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 													 AND pd28c.productiondataid > pd1.productiondataid
 													 AND pd28c.productiondataid < pd61.productiondataid)) pd
-								  ON pd.productiondataid = df.productiondataid
+								  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 									INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE AND pds.valueflag = 1
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
@@ -2015,6 +2017,7 @@ ORDER BY 产品类别,产品编码
 													 ,pd1.barcode
 													 ,pd1.valueflag 
 													 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+													  ,pd1.productiondataid  fproductiondataid
 										FROM (SELECT *
 												FROM (SELECT pd28.goodsname
 															,pd28.groutingdailydetailid
@@ -2058,8 +2061,7 @@ ORDER BY 产品类别,产品编码
 												 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 												 AND pd28c.productiondataid > pd1.productiondataid
 												 AND pd28c.productiondataid < pd61.productiondataid)) pd
-							  ON pd.productiondataid = df.productiondataid
-
+							  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
 									LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 
@@ -2262,6 +2264,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 												 ,pd1.barcode
 												 ,pd1.valueflag 
 												 ,nvl(pd61.productiondataid, pd1.productiondataid) productiondataid
+												 ,pd1.productiondataid  fproductiondataid
 									FROM (SELECT *
 											FROM (SELECT pd28.goodsname
 														,pd28.groutingdailydetailid
@@ -2305,8 +2308,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 											 AND pd28c.kilncarbatchno = pd1.kilncarbatchno
 											 AND pd28c.productiondataid > pd1.productiondataid
 											 AND pd28c.productiondataid < pd61.productiondataid)) pd
-						  ON pd.productiondataid = df.productiondataid
-
+						  ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid)
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
 									LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID  

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -107,6 +107,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                  ,gtp.goodstypecode
                                                                  ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                                                 ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                                                ,pd.productiondataid  fproductiondataid
                                                                  ,pd.createtime
                                                     FROM (SELECT * FROM (SELECT pd28.groutinglinecode
                                                                         ,pd28.reworkprocedureid
@@ -170,7 +171,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                      AND tp_mst_datadictionary.dictionarytype = 'TPC002'                  
                                                   ) pd
                                                
-                                                LEFT JOIN TP_PM_DEFECT df ON DF.productiondataid=PD.productiondataid AND DF.VALUEFLAG=1  
+                                                LEFT JOIN TP_PM_DEFECT df ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid) AND DF.VALUEFLAG=1  
 												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1   
 												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE = PD.BARCODE AND PDS.VALUEFLAG=1
 												GROUP BY pd.GOODSCODE,LUSTERWAREWEIGHT,PD.GOODSNAME,PD.LOGONAME,PD.DICTIONARYVALUE,
@@ -423,6 +424,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                  ,gtp.goodstypecode
                                                                  ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid
                                                                 ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                                                ,pd.productiondataid  fproductiondataid
                                                                  ,pd.createtime
                                                     FROM (SELECT * FROM (SELECT pd28.groutinglinecode
                                                                         ,pd28.reworkprocedureid
@@ -485,7 +487,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                       ON tp_mst_datadictionary.dictionaryid = good.glazetypeid
                                                      AND tp_mst_datadictionary.dictionarytype = 'TPC002'                  
                                                   ) pd
-                                                LEFT JOIN TP_PM_DEFECT df ON    df.productiondataid =  pd.productiondataid AND DF.VALUEFLAG=1 
+                                                LEFT JOIN TP_PM_DEFECT df ON    df.productiondataid in (pd.productiondataid ,pd.fproductiondataid) AND DF.VALUEFLAG=1 
 												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1   
 												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE = PD.BARCODE AND PDS.VALUEFLAG=1
 												GROUP BY pd.GOODSCODE ,pd.productiondataid,LUSTERWAREWEIGHT,PD.GOODSNAME,PD.LOGONAME,PD.DICTIONARYVALUE,
@@ -738,6 +740,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                          ,gtp.goodstypecode
                                                          ,nvl(pd61.goodsleveltypeid, pd.goodsleveltypeid) goodsleveltypeid  
                                                          ,nvl(pd61.productiondataid, pd.productiondataid) productiondataid
+                                                         ,pd.productiondataid  fproductiondataid
                                                          ,pd.createtime
                                             FROM (SELECT * FROM (SELECT pd28.groutinglinecode
                                                               ,pd28.reworkprocedureid
@@ -801,7 +804,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                               ON tp_mst_datadictionary.dictionaryid = good.glazetypeid
                                              AND tp_mst_datadictionary.dictionarytype = 'TPC002'                  
                                           ) pd 
-                                                LEFT JOIN TP_PM_DEFECT df ON df.productiondataid =  pd.productiondataid AND DF.VALUEFLAG=1 
+                                                LEFT JOIN TP_PM_DEFECT df ON df.productiondataid in (pd.productiondataid ,pd.fproductiondataid) AND DF.VALUEFLAG=1 
 												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1   
 												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE = PD.BARCODE AND PDS.VALUEFLAG=1
 												GROUP BY pd.GOODSCODE,pd.productiondataid,LUSTERWAREWEIGHT,PD.GOODSNAME,PD.LOGONAME,PD.DICTIONARYVALUE,