优化三个报表 sql

wwwroot/mes/rpt/rpt011/rpt.ashx

@@ -27,7 +27,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 goodsCodes = context.Request["GOODSCODE"].ToString().Split(',');
             }
-
+            string usercode = context.Request["usercodeMaster"] + "";
+            string buildingno = context.Request["buildingnoMaster"] + "";
+            string username = context.Request["usernameMaster"] + "";
+            DateTime datebegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
             string goodssql = @"SELECT
                                         GOODSCODE 
                                         FROM TP_MST_GOODS
@@ -100,8 +104,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					    DECODE( GROUPING_ID ( T.MONITORCODE, T.GOODSCODE ), 1, '--', 3, '--', T.GOODSNAME ) AS 物料名称,
 					    DECODE( GROUPING_ID ( T.MONITORCODE, T.GOODSCODE ), 1, '--', 3, '--', T.USERNAME ) AS 成型,
 					    DECODE( GROUPING_ID ( T.MONITORCODE, T.GOODSCODE ), 1, '--', 3, '--', T.GROUTINGLINENO ) AS 成型线号,
-					    SUM( CASE WHEN T.PROCEDUREID IN ( {PROCEDURE1} ) AND T.VALUEFLAG = '1' THEN T.CNUM ELSE 0 END ) AS 接收数量,
-					    SUM( CASE WHEN T.PROCEDUREID IN ( {PROCEDURE2} ) AND T.VALUEFLAG = '1' THEN T.CNUM ELSE 0 END ) AS 实收数量,
+					    SUM( CASE WHEN T.PROCEDUREID IN ( " + procedureId1 + @"  ) AND T.VALUEFLAG = '1' THEN T.CNUM ELSE 0 END ) AS 接收数量,
+					    SUM( CASE WHEN T.PROCEDUREID IN ( " + procedureId2 + @"  ) AND T.VALUEFLAG = '1' THEN T.CNUM ELSE 0 END ) AS 实收数量,
 					    SUM( CASE WHEN T.VALUEFLAG = '0' THEN T.CNUM ELSE 0 END ) AS 返修数量 
 					FROM
 						(
@@ -124,15 +128,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							LEFT JOIN TP_MST_USER U ON U.USERID = G.USERID 
 						WHERE
 							( 
-								(P.VALUEFLAG = '1' AND P.CREATETIME >= @DATEBEGIN@ AND P.CREATETIME <= @DATEEND@ )
+								(P.VALUEFLAG = '1' AND P.CREATETIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') AND P.CREATETIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss') )
 								OR 
-								(P.VALUEFLAG = '0' AND P.BACKOUTTIME >= @DATEBEGIN@ AND P.BACKOUTTIME <= @DATEEND@ ) 
+								(P.VALUEFLAG = '0' AND P.BACKOUTTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') AND P.BACKOUTTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss') ) 
 							)
-							AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL) 
-							AND P.PROCEDUREID IN ( {PROCEDUREID} ) -- 一期还是二期
-							   AND P.GOODSCODE IN({goodsCodes})
-							AND ( U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL )
-							AND ( MU.USERNAME = @USERNAME@ OR @USERNAME@ IS NULL )
+							AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"'  IS NULL) 
+							AND P.PROCEDUREID IN ( " + procedureId + @" ) -- 一期还是二期
+							   AND P.GOODSCODE IN(" + goodssql + @")
+							AND ( U.USERCODE = '" + usercode + @"' OR '" + usercode + @"' IS NULL )
+							AND ( MU.USERNAME = '" + username + @"' OR '" + username + @"' IS NULL )
 						GROUP BY
 							MU.USERCODE,
 							MU.USERNAME,
@@ -164,23 +168,19 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						) 
 					ORDER BY
 						T.MONITORCODE
-                "
-                .Replace("{PROCEDUREID}",procedureId)
-                .Replace("{PROCEDURE1}",procedureId1)
-                .Replace("{PROCEDURE2}",procedureId2)
-                .Replace("{goodsCodes}", goodssql)
+                " 
                 ;
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 //sqlPara.Add(new CDAParameter("ACCOUNTID", context.Session["accountId"].ToString()));
 
-                sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"]));
-                sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeMaster"]));
-                sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
-                sqlPara.Add(new CDAParameter("USERNAME", context.Request["usernameMaster"]));
+                //sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"]));
+                //sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeMaster"]));
+                //sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
+                //sqlPara.Add(new CDAParameter("USERNAME", context.Request["usernameMaster"]));
 
 
                 //if(context.Request["USERID"] is object)

wwwroot/mes/rpt/rpt012/rpt.ashx

@@ -17,7 +17,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
@@ -26,14 +26,20 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 goodsCodes = context.Request["GOODSCODE"].ToString().Split(',');
             }
-
+            string usercode = context.Request["usercodeMaster"] + "";
+            string buildingno = context.Request["buildingnoMaster"] + "";
+            string goodsmodel = context.Request["goodsmodelMaster"] + "";
+            string username = context.Request["usernameMaster"] + "";
+            int procedureid = Convert.ToInt32(context.Request["procedureidMaster"]);
+            DateTime datebegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
             string goodssql = @"SELECT
                                         GOODSCODE 
                                         FROM TP_MST_GOODS
 										WHERE 1=1";
 
 
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -54,16 +60,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
 
             }
-            #endregion 
+            #endregion
 
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //确定modeltype 成型工序 需要附加条件 modeltype=5 
                 string modelType = "";
 
-                if(context.Request["procedureidMaster"].ToString() =="2" ||
-                    context.Request["procedureidMaster"].ToString() =="25"  )
+                if (context.Request["procedureidMaster"].ToString() == "2" ||
+                    context.Request["procedureidMaster"].ToString() == "25")
                 {
                     modelType = "AND PB.MODELTYPE = 5";
                 }
@@ -84,7 +90,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"])
                     );
                 string colStr = "";
-                for(int i=0;i<pTable.Rows.Count;i++)
+                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();
@@ -144,14 +150,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									P.VALUEFLAG = '1' 
 									AND P.PROCEDUREID = 13 AND P.CHECKBATCHNO = 1
 									AND P.GOODSLEVELTYPEID <> 4 
-									AND P.CHECKTIME >= @DATEBEGIN@ 
-									AND P.CHECKTIME <= @DATEEND@
+									AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
+									AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')
 									AND P.ISREFIRE = '0' 
-									AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-									AND (D.DEFECTPROCEDUREID = @PROCEDUREID@ OR @PROCEDUREID@ IS NULL)
-									AND GS.GOODSCODE IN({goodsCodes})
-									AND (U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL)
-									AND (MU.USERNAME = @USERNAME@ OR @USERNAME@ IS NULL)
+									AND (L.BUILDINGNO =  '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
+									AND (D.DEFECTPROCEDUREID = " + procedureid + @" OR " + procedureid + @" IS NULL)
+									AND GS.GOODSCODE IN("+goodssql+@")
+									AND (U.USERCODE = '" + usercode + @"' OR '" + usercode + @"' IS NULL)
+									AND (MU.USERNAME =  '" + username + @"' OR  '" + username + @"' IS NULL)
 								GROUP BY
 									GROUPING SETS (
 										( MU.USERCODE,MU.USERNAME,U.USERCODE,U.USERNAME,GS.GOODSMODEL,D.DEFECTID,M.DEFECTNAME ),
@@ -167,7 +173,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									GROUPING_ID ( MU.USERCODE, U.USERCODE, GS.GOODSMODEL, D.DEFECTID ) 
 								) 
 								) PIVOT (
-								SUM( CNUM ) FOR DEFECT IN ( {COLSTR}, '合计' AS 合计 ) 
+								SUM( CNUM ) FOR DEFECT IN ( " + colStr +  @", '合计' AS 合计 ) 
 							) 
 						ORDER BY
 							MONITORCODE, 组别, 工号, 产品型号 
@@ -197,21 +203,21 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								INNER JOIN TP_PM_GROUTINGDAILY G ON G.GROUTINGDAILYID = P.GROUTINGDAILYID
 								LEFT JOIN TP_MST_USER MU ON MU.USERID = L.MONITORID --LEFT JOIN TP_PM_DEFECT D ON P.PRODUCTIONDATAID = D.PRODUCTIONDATAID
 								LEFT JOIN TP_PM_PRODUCTIONDATA PB ON P.BARCODE = PB.BARCODE 
-								{MODELTYPE}
+								" + modelType+ @"
 								LEFT JOIN TP_MST_USER U ON U.USERID = PB.USERID 
 								LEFT JOIN TP_MST_GOODS GS ON P.GOODSID = GS.GOODSID 
 							WHERE
 								P.VALUEFLAG = '1' 
 								AND P.PROCEDUREID = 13 AND P.CHECKBATCHNO = 1
-								AND P.CHECKTIME >= @DATEBEGIN@ 
-								AND P.CHECKTIME <= @DATEEND@
-								AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-								AND ( @PROCEDUREID@ IS NULL OR PB.PROCEDUREID = @PROCEDUREID@ )
+								AND P.CHECKTIME >=to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
+								AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')
+								AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
+								AND ( " + procedureid + @" IS NULL OR PB.PROCEDUREID = " + procedureid + @" )
 								AND P.ISREFIRE = '0' 
 								AND PB.VALUEFLAG='1'
-								AND GS.GOODSCODE IN({goodsCodes})
-								AND (U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL)
-								AND (MU.USERNAME = @USERNAME@ OR @USERNAME@ IS NULL)
+								AND GS.GOODSCODE IN("+ goodssql + @")
+								AND (U.USERCODE = '" + usercode + @"' OR '" + usercode + @"' IS NULL)
+								AND (MU.USERNAME = '" + username + @"' OR  '" + username + @"' IS NULL)
 							GROUP BY
 								GROUPING SETS (
 									( MU.USERCODE, MU.USERNAME, U.USERCODE, U.USERNAME, GS.GOODSMODEL ),
@@ -223,22 +229,20 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							MONITORCODE, 组别, 工号, 产品型号 
 						) PC ON PD.MONITORCODE = PC.MONITORCODE 
 						AND ( PC.GID = 3 OR PC.GID=7 OR ( PD.工号 = PC.工号 AND PD.产品型号 = PC.产品型号 ) )
-                ".Replace("{COLSTR}",colStr).Replace("{MODELTYPE}",modelType)
-                 .Replace("{goodsCodes}", goodssql)
-                ;
+                "  ;
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 //sqlPara.Add(new CDAParameter("ACCOUNTID", context.Session["accountId"].ToString()));
 
-                sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
-                sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"]));
-                //sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeMaster"]));
-                sqlPara.Add(new CDAParameter("GOODSMODEL", context.Request["goodsmodelMaster"]));
-                sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
-                sqlPara.Add(new CDAParameter("USERNAME", context.Request["usernameMaster"]));
+                //sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
+                //sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"]));
+                ////sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeMaster"]));
+                //sqlPara.Add(new CDAParameter("GOODSMODEL", context.Request["goodsmodelMaster"]));
+                //sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
+                //sqlPara.Add(new CDAParameter("USERNAME", context.Request["usernameMaster"]));
 
                 //if(context.Request["USERID"] is object)
                 //{
@@ -264,7 +268,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
 
             }

wwwroot/mes/rpt/rpt013/rpt.ashx

@@ -27,7 +27,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 goodsCodes = context.Request["GOODSCODE"].ToString().Split(',');
             }
-
+            string usercode = context.Request["usercodeMaster"] + "";
+            string buildingno = context.Request["buildingnoMaster"] + "";
+            int procedureid = Convert.ToInt32(context.Request["procedureidMaster"]);
+            DateTime  datebegin =    Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime  dateend  =    Convert.ToDateTime(context.Request["dateendMaster"]);
             //string goodssql = @"SELECT  GOODSCODE   FROM TP_MST_GOODS WHERE 1=1";
             /*
             string goodssql = "";
@@ -60,7 +64,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
 
             }*/
-            
+
             string goodssql = "";
             if (goodsCodes.Length > 1 || goodsCodes[0]!="")
             {
@@ -212,7 +216,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
                 else
                 {
-                    sqlStr += @"COUNT( * ) AS CNUM ";
+                    sqlStr += @"COUNT( 1 ) AS CNUM ";
                 }
                 sqlStr += @"FROM
 									TP_PM_PRODUCTIONDATA P
@@ -227,16 +231,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									LEFT JOIN TP_MST_GOODS GS ON GS.GOODSID = P.GOODSID
 								WHERE
 									P.VALUEFLAG = '1'
-									AND P.PROCEDUREID = @CHECKPROCEDUREID@ 
+									AND P.PROCEDUREID = " + checkProcedureId + @"
 									AND P.CHECKBATCHNO = 1
 									AND P.GOODSLEVELTYPEID <> 4
-									AND P.CHECKTIME >= @DATEBEGIN@ 
-									AND P.CHECKTIME <= @DATEEND@
-									AND P.ISREFIRE = @ISREFIRE@ 
-									AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-									AND (D.DEFECTPROCEDUREID = @PROCEDUREID@ OR @PROCEDUREID@ IS NULL) " +
+									AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
+									AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')  
+									AND P.ISREFIRE = " + isRefire + @" 
+									AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
+									AND (D.DEFECTPROCEDUREID = " + procedureid + @"  OR " + procedureid + @" IS NULL) " +
                                     goodssql + @"
-									AND (U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL)
+									AND (U.USERCODE = '" + usercode + @"' OR '" + usercode + @"' IS NULL)
 								GROUP BY
 									GROUPING SETS (
 										( U.USERCODE, U.USERNAME, GS.GOODSMODEL, D.DEFECTID, M.DEFECTNAME ),
@@ -276,7 +280,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
                 else
                 {
-                    sqlStr += @"COUNT( * ) AS 出窑数 ";
+                    sqlStr += @"COUNT( 1 ) AS 出窑数 ";
                 }
                 sqlStr += @"FROM
 								TP_PM_PRODUCTIONDATA P
@@ -289,17 +293,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_MST_GOODS GS ON GS.GOODSID = P.GOODSID
 							WHERE
 								P.VALUEFLAG = '1'
-								AND P.PROCEDUREID = @CHECKPROCEDUREID@
+								AND P.PROCEDUREID = " + checkProcedureId + @"
 
 								AND P.CHECKBATCHNO = 1
-								AND P.CHECKTIME >= @DATEBEGIN@ 
-								AND P.CHECKTIME <= @DATEEND@
-								AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-								AND ( @PROCEDUREID@ IS NULL OR PB.PROCEDUREID = @PROCEDUREID@ )
+								AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss')  
+								AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')  
+								AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
+								AND ( " + procedureid + @" IS NULL OR PB.PROCEDUREID = " + procedureid + @" )
 								--AND P.ISREFIRE = '0'
 								AND PB.VALUEFLAG='1' " +
                                     goodssql + @"
-								AND (U.USERCODE = @USERCODE@ OR @USERCODE@ IS NULL)
+								AND (U.USERCODE = '" + usercode + @"' OR '" + usercode + @"' IS NULL)
 							GROUP BY
 								GROUPING SETS ( ( U.USERCODE, U.USERNAME, GS.GOODSMODEL ), ( U.USERCODE, U.USERNAME ),() )
 							) T
@@ -313,13 +317,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 //sqlPara.Add(new CDAParameter("ACCOUNTID", context.Session["accountId"].ToString()));
 
-                sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
-                sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
-                sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"]));
-                sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
-                sqlPara.Add(new CDAParameter("CHECKPROCEDUREID", checkProcedureId));
-                sqlPara.Add(new CDAParameter("ISREFIRE", isRefire));
+                //sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
+                //sqlPara.Add(new CDAParameter("PROCEDUREID", Convert.ToInt32(context.Request["procedureidMaster"]),DataType.Int32));
+                //sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["buildingnoMaster"], DataType.NVarChar));
+                //sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"], DataType.NVarChar));
+                //sqlPara.Add(new CDAParameter("CHECKPROCEDUREID", checkProcedureId, DataType.NVarChar));
+                //sqlPara.Add(new CDAParameter("ISREFIRE", isRefire, DataType.NVarChar));
 
                 //if(context.Request["USERID"] is object)
                 //{
@@ -555,9 +559,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            JZ_RPT013_22
                             WHERE FORWARDTIME >= @BEGINMONTH@ 
 								AND FORWARDTIME <= @ENDMONTH@
-								AND (BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
-								AND ( @PROCEDUREID@ IS NULL OR PROCEDUREID = @PROCEDUREID@ )
-                                AND (@USERCODE@ IS NULL OR USERCODE_FRONT = @USERCODE@)
+								AND (BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
+								AND ( " + procedureid + @" IS NULL OR PROCEDUREID = " + procedureid + @" )
+                                AND ('" + usercode + @"' IS NULL OR USERCODE_FRONT = '" + usercode + @"')
                                 AND (@GOODSMODEL@ IS NULL OR GOODSCODE_FRONT = @GOODSMODEL@)
                             GROUP BY
 	                            grouping sets ( ( USERCODE_FRONT, USERNAME_FRONT, GOODSCODE_FRONT, GOODSCODE_BEHIND ), ( USERCODE_FRONT, USERNAME_FRONT ),() )