电视的去重

wwwroot/main/DashBoard/rpt01311/rpt.ashx

@@ -63,7 +63,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //读取工序配置缺陷
                 string sqlStr = @"
 					SELECT
-						DEFECTNAME 
+						DEFECTID,DEFECTNAME 
 					FROM
 						TP_MST_DEFECT 
 					WHERE
@@ -78,13 +78,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     );
 
                 string colStr = "";
+                string colStrId = "";
                 for(int i=0;i<pTable.Rows.Count;i++)
                 {
                     //if (i > 0) colStr += ",";
                     colStr += "'" + pTable.Rows[i]["DEFECTNAME"].ToString() + "' AS " + pTable.Rows[i]["DEFECTNAME"].ToString();
                     colStr += ",";
+                        colStrId +=   pTable.Rows[i]["DEFECTID"].ToString() + ",";
+                      
                 }
-
+                colStrId = "(" + colStrId.Substring(0,colStrId.Length-1) + ")";
                 //读取报表数据
                 sqlStr = @"
 					SELECT
@@ -117,7 +120,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									U.USERNAME,
 									GS.GOODSMODEL,
 									M.DEFECTNAME AS DEFECT,
-									COUNT( * ) AS CNUM 
+									COUNT(  distinct p.productiondataid) AS CNUM 
 								FROM
 									TP_PM_PRODUCTIONDATA P
 									INNER JOIN TP_PC_GROUTINGLINE L ON P.GROUTINGLINEID = L.GROUTINGLINEID
@@ -137,7 +140,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND P.CHECKTIME <= @DATEEND@
 									AND P.ISREFIRE = @ISREFIRE@ 
 									AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-									AND (D.DEFECTPROCEDUREID IN ({PROCEDUREID}) )
+									--AND (D.DEFECTPROCEDUREID IN ({PROCEDUREID}) )
+                                     and d.defectid in {COLSTRID}
 									AND (GS.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 									AND (U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL)
 								GROUP BY
@@ -201,7 +205,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							工号, 产品型号
 						) PC ON ((PC.GID = 3 OR PC.GID = 1) AND PD.工号 = PC.工号 AND PD.产品型号 IS NULL ) OR ( PD.工号 = PC.工号 AND PD.产品型号 = PC.产品型号 )
 
-                ".Replace("{COLSTR}",colStr).Replace("{MODELTYPE}",modelType).Replace("{PROCEDUREID}",procedureId);
+                ".Replace("{COLSTR}",colStr).Replace("{COLSTRID}",colStrId).Replace("{MODELTYPE}",modelType).Replace("{PROCEDUREID}",procedureId);
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();