各个工序的 商标 用注浆表替换

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -97,8 +97,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                   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
+                                  
                                   LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
+LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=gd.LOGOID
                                   LEFT JOIN TP_PC_GROUTINGLINE GDL ON GDL.GROUTINGLINEID=gd.GROUTINGLINEID
                                   LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=good.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
                                 WHERE

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -137,7 +137,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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 ,

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -139,7 +139,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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 ,

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -140,7 +140,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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 ,

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -135,7 +135,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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.DEFECTTYPEID = 4 ";
                 sqlStr += @"  GROUP BY Grouping sets ( (GD.GOODSCODE ,

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -137,7 +137,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -147,7 +147,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID " ;
                 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 ,

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -148,7 +148,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID" ;
                 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 ,

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -149,7 +149,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.groutingdailydetailid=PD.groutingdailydetailid
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID " ;
                 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

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -72,7 +72,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE=PD.BARCODE
                                 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_MST_LOGO LG ON GDL.LOGOID = LG.LOGOID 
                                 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