产品合格数统计表

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -35,7 +35,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 goodsCodes = context.Request["GOODSCODE"].ToString().Split(',');
             }
 
-            string goodssql = @"SELECT GOODSCODE 
+            string goodssql = @"SELECT GOODSID 
                                         FROM TP_MST_GOODS where 1=1 ";
             if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
@@ -421,13 +421,13 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                             ON G.LOGOID = O.LOGOID
                           LEFT JOIN TP_MST_GOODS M
                             ON G.GOODSID = M.GOODSID
-                         WHERE 1=1 
-                           AND M.GOODSCODE IN({goodsCodes})
+                         WHERE 1=1  
+                            AND M.GOODSID IN({goodsCodes})
                            AND L.BUILDINGNO {BUILDINGNO}
-                           AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
-                           AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
-                           AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
-                           AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)
+                           AND ( @LOGOID@ IS NULL OR G.LOGOID = @LOGOID@ )
+                           AND (@GLAZETYPEID@ IS NULL OR  G.GLAZETYPEID = @GLAZETYPEID@)
+                           AND (@GOODSMODEL@ IS NULL  OR  M.GOODSMODEL = @GOODSMODEL@)
+                           AND (@GOODSNAME@ IS NULL OR  M.GOODSNAME = @GOODSNAME@)
                          GROUP BY GROUPING SETS((L.BUILDINGNO, M.GOODSID, M.GOODSCODE, M.GOODSNAME, M.GOODSMODEL, G.GLAZETYPEID, G.LOGOID, D.DICTIONARYVALUE, O.LOGONAME)
                          ,(L.BUILDINGNO),())
                          ORDER BY L.BUILDINGNO
@@ -503,13 +503,13 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                             ON G.LOGOID = O.LOGOID
                           LEFT JOIN TP_MST_GOODS M
                             ON G.GOODSID = M.GOODSID
-                         WHERE 1=1 
-                           AND M.GOODSCODE IN({goodsCodes})
-                           AND L.BUILDINGNO {BUILDINGNO}
-                           AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
-                           AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
-                           AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
-                           AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)
+                         WHERE 1=1  
+                            AND M.GOODSID IN({goodsCodes})
+                           AND L.BUILDINGNO {BUILDINGNO} 
+                            AND ( @LOGOID@ IS NULL OR G.LOGOID = @LOGOID@ )
+                           AND (@GLAZETYPEID@ IS NULL OR  G.GLAZETYPEID = @GLAZETYPEID@)
+                           AND (@GOODSMODEL@ IS NULL  OR  M.GOODSMODEL = @GOODSMODEL@)
+                           AND (@GOODSNAME@ IS NULL OR  M.GOODSNAME = @GOODSNAME@)
                           GROUP BY GROUPING SETS(( M.GOODSID, M.GOODSCODE, M.GOODSNAME, M.GOODSMODEL,G.GLAZETYPEID,  D.DICTIONARYVALUE, O.LOGONAME),())
                          ORDER BY M.GOODSCODE
                                  ,GID) T