替换语句

wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -68,6 +68,26 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string testFlagMaster = context.Request["testFlagMaster"];
                 if (testFlagMaster == "2") testFlagMaster = "";
 
+                string testmouldflag = " ";
+                if (testType == "0")
+                {
+                    testmouldflag = " AND GDD.TESTMOULDFLAG = '0' ";
+                }
+                else if (testType == "1")
+                {
+                    testmouldflag = " AND GDD.TESTMOULDFLAG = '1' ";
+                }
+
+                string testflagmaster = " ";
+                if (testFlagMaster == "0")
+                {
+                    testflagmaster = " AND GDD.TESTFLAG = '0' ";
+                }
+                else if (testFlagMaster == "1")
+                {
+                    testflagmaster = " AND GDD.TESTFLAG = '1' ";
+                }
+
                 //读取报表数据
                 string sqlStr = @"
                         
@@ -108,8 +128,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-			AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-			AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+			{TESTMOULDFLAG}
+			{TESTFLAG}
         AND GH.DATATYPE IN (1, 2)
         AND G.SCRAPSUMFLAG = '1'
       GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),())
@@ -145,8 +165,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (@HIGHPRESSUREFLAG@ = '-1' OR GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ )
-			AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-			AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+			{TESTMOULDFLAG}
+			{TESTFLAG}
 			AND GH.DATATYPE IN ( 3, 4 ) 
 			AND G.SCRAPSUMFLAG = '1' 
       GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),())
@@ -187,8 +207,8 @@ SELECT
 					AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-			AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-			AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+			{TESTMOULDFLAG}
+			{TESTFLAG}
 					AND SP.SCRAPTYPE IN (2)
 					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
 					UNION ALL-- 工序报损撤销
@@ -221,8 +241,8 @@ SELECT
 							AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')
 							--  AND SP.SCRAPTYPE IN (0, 2, 3)
 							UNION ALL
@@ -290,8 +310,8 @@ SELECT
 												AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 												AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 												AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-												AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-												AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+												{TESTMOULDFLAG}
+												{TESTFLAG}
 											) T 
 										WHERE
 											T.RK <= 1 
@@ -342,8 +362,8 @@ SELECT
                     AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 					AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 					AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-					AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-					AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+					{TESTMOULDFLAG}
+					{TESTFLAG}
 					AND SP.SCRAPTYPE IN (3)
 					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
 					UNION ALL-- 工序报损撤销
@@ -376,8 +396,8 @@ SELECT
                             AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')
 							--  AND SP.SCRAPTYPE IN (0, 2, 3)
 							 UNION ALL
@@ -444,8 +464,8 @@ SELECT
                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							                    AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							                    AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							                    {TESTMOULDFLAG}
+							                    {TESTFLAG}
 											) T 
 										WHERE
 											T.RK <= 1 
@@ -497,8 +517,8 @@ SELECT
                      AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 					AND SP.SCRAPTYPE IN (0)
 					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
 					UNION ALL-- 工序报损撤销
@@ -530,8 +550,8 @@ SELECT
                              AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 						GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD') UNION ALL
 							-- 干补报损
 ---------------------------------------------------
@@ -596,8 +616,8 @@ SELECT
                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							                    AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							                    AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							                    {TESTMOULDFLAG}
+							                    {TESTFLAG}
 											) T 
 										WHERE
 											T.RK <= 1 
@@ -649,8 +669,8 @@ SELECT
                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 				AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 				AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-				AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-				AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+				{TESTMOULDFLAG}
+				{TESTFLAG}
 			GROUP BY TO_CHAR(SP.SPECIALREPAIRTIME, 'YYYYMMDD'))T GROUP BY
 		GROUPING SETS ( T.时间, ( ) )
  ),
@@ -713,8 +733,8 @@ SELECT
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							            AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							            AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							            AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							            AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							            {TESTMOULDFLAG}
+							            {TESTFLAG}
                                         AND PD.ISREFIRE = '0'
                                         AND PD.Islengbu = '0'
                                         --AND PD.KILNID IN(1,2,5)-- 取本烧的窑炉
@@ -805,8 +825,8 @@ SELECT BAR.GOODSCODE,
                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
                                AND GH.FHTIME < @DATEEND@ )TT  GROUP BY TT.CHARG )TT2 GROUP BY
 		GROUPING SETS ( TT2.时间, ( ) )
  ),
@@ -890,8 +910,8 @@ SELECT BAR.GOODSCODE,
                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
                                 )TT  GROUP BY TT.CHARG)TT2 GROUP BY
 		GROUPING SETS ( TT2.时间, ( ) )
  ),
@@ -973,8 +993,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 0
 																			  AND SP.GOODSLEVELTYPEID in (7)
 																				--AND SP.SCRAPTYPE = 1
@@ -1054,8 +1074,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 0
 																				AND SP.GOODSLEVELTYPEID in (7)
 																				--AND SP.SCRAPTYPE = 1
@@ -1133,8 +1153,8 @@ SELECT GOODSCODE,
                                                  AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
                                                 ) T
                                       WHERE T.RK <= 1) SP
                               INNER JOIN TSAP_HEGII_DATAITEM HGDI
@@ -1236,8 +1256,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 0
 																			  AND SP.GOODSLEVELTYPEID in (8,9)
 																				--AND SP.SCRAPTYPE = 1
@@ -1317,8 +1337,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 0
 																				AND SP.GOODSLEVELTYPEID in (8,9)
 																				--AND SP.SCRAPTYPE = 1
@@ -1398,8 +1418,8 @@ SELECT GOODSCODE,
                                                  AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
                                                 ) T
                                       WHERE T.RK <= 1) SP
                               INNER JOIN TSAP_HEGII_DATAITEM HGDI
@@ -1502,8 +1522,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 6
 																			  AND SP.GOODSLEVELTYPEID in (7)
 																				--AND SP.SCRAPTYPE = 1
@@ -1583,8 +1603,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 6
 																				AND SP.GOODSLEVELTYPEID in (7)
 																				--AND SP.SCRAPTYPE = 1
@@ -1664,8 +1684,8 @@ SELECT GOODSCODE,
                                                  AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))                                                
+							{TESTMOULDFLAG}
+							{TESTFLAG}                                                
                             ) T
                                       WHERE T.RK <= 1) SP
                               INNER JOIN TSAP_HEGII_DATAITEM HGDI
@@ -1767,8 +1787,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 6
 																			  AND SP.GOODSLEVELTYPEID in (8,9)
 																				--AND SP.SCRAPTYPE = 1
@@ -1848,8 +1868,8 @@ SELECT GOODSCODE,
                                          AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
 																				AND PD.ISREFIRE = 6
 																				AND SP.GOODSLEVELTYPEID in (8,9)
 																				--AND SP.SCRAPTYPE = 1
@@ -1929,8 +1949,8 @@ SELECT GOODSCODE,
                                                  AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND (@TESTMOULDFLAG@ = '-1' OR (@TESTMOULDFLAG@ <> '-1'  AND GDD.TESTMOULDFLAG = @TESTMOULDFLAG@))
-							AND (@TESTFLAG@ = '-1' OR (@TESTFLAG@ <> '-1' and GDD.TESTFLAG = @TESTFLAG@ ))
+							{TESTMOULDFLAG}
+							{TESTFLAG}
                                                 ) T
                                       WHERE T.RK <= 1) SP
                               INNER JOIN TSAP_HEGII_DATAITEM HGDI
@@ -2013,14 +2033,17 @@ SELECT GOODSCODE,
                 ".Replace("YYYYMM",totalMaster)
                  .Replace("{GOODSID}",goodsId)
                  .Replace("{GROUTINGLINEID}",groutinglineId)
-                 .Replace("{DATESTR}",datestr);
+                 .Replace("{DATESTR}",datestr)
+                 .Replace("{TESTMOULDFLAG}", testmouldflag)
+                 .Replace("{TESTFLAG}",testflagmaster);
 
+                     
                 //获取查询条件
                 if (context.Request["checke"].ToString()=="false")
                 {
-                        //highFlag ="null";
-                        testType = "-1";
-                        testFlagMaster = "-1";
+                    //highFlag ="null";
+                    testType = "-1";
+                    testFlagMaster = "-1";
                 }
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));