qinqi преди 1 година
родител
ревизия
2e834b012a
променени са 1 файла, в които са добавени 29 реда и са изтрити 29 реда
  1. 29 29
      wwwroot/mes/rpt2/rpt8009/rpt.ashx

+ 29 - 29
wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -54,7 +54,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string groutinglineId = context.Request["groutinglineMaster[]"] is object ? context.Request["groutinglineMaster[]"].ToString() : "0,0";
                 if (groutinglineId == "0,0" && (context.Request["groutinglineMaster"] is object)) groutinglineId = context.Request["groutinglineMaster"].ToString();
                 if (groutinglineId == "") groutinglineId = "0,0";
-
+ 
                 string goodsId = context.Request["goodsMaster[]"] is object ? context.Request["goodsMaster[]"].ToString() : "0,0";
                 if (goodsId == "0,0" && (context.Request["goodsMaster"] is object)) goodsId = context.Request["goodsMaster"].ToString();
                 if (goodsId == "") goodsId = "0,0";
@@ -125,7 +125,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		 ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
       WHERE GH.CREATETIME >= @DATEBEGIN@
         AND GH.CREATETIME < @DATEEND@
-				AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+				AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 			{TESTMOULDFLAG}
@@ -162,7 +162,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		WHERE
 			GH.CREATETIME >= @DATEBEGIN@
 			AND GH.CREATETIME < @DATEEND@
-            AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+            AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (@HIGHPRESSUREFLAG@ = '-1' OR GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ )
 			{TESTMOULDFLAG}
@@ -204,7 +204,7 @@ SELECT
 					SP.AUDITSTATUS = 1 
 					AND SP.AUDITDATE >= @DATEBEGIN@
 					AND SP.AUDITDATE < @DATEEND@
-					AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+					AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 			AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 			AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 			{TESTMOULDFLAG}
@@ -238,7 +238,7 @@ SELECT
 							AND SP.SCRAPTYPE IN (2)
 							AND SP.BACKOUTTIME >= @DATEBEGIN@ 
 							AND SP.BACKOUTTIME < @DATEEND@
-							AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -307,7 +307,7 @@ SELECT
 												AND SP.SCRAPTYPE IN (2)
 												AND SP.AUDITDATE >= @DATEBEGIN@
 												AND SP.AUDITDATE < @DATEEND@
-												AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+												AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 												AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 												AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 												{TESTMOULDFLAG}
@@ -359,7 +359,7 @@ SELECT
 					SP.AUDITSTATUS = 1 
 					AND SP.AUDITDATE >= @DATEBEGIN@ 
 					AND SP.AUDITDATE < @DATEEND@
-                    AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                    AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 					AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 					AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 					{TESTMOULDFLAG}
@@ -393,7 +393,7 @@ SELECT
 							AND SP.SCRAPTYPE IN (3)
 							AND SP.BACKOUTTIME >= @DATEBEGIN@ 
 							AND SP.BACKOUTTIME < @DATEEND@
-                            AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                            AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -460,7 +460,7 @@ SELECT
 												AND SP.SCRAPTYPE IN (3)
 												AND SP.AUDITDATE >= @DATEBEGIN@ 
 												AND SP.AUDITDATE < @DATEEND@
-                                                AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							                    AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							                    {TESTMOULDFLAG}
@@ -515,7 +515,7 @@ SELECT
 					SP.AUDITSTATUS = 1 
 					AND SP.AUDITDATE >= @DATEBEGIN@ 
 					AND SP.AUDITDATE < @DATEEND@ 
-                     AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                     AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -550,7 +550,7 @@ SELECT
 							AND SP.SCRAPTYPE IN (0)
 							AND SP.BACKOUTTIME >= @DATEBEGIN@ 
 							AND SP.BACKOUTTIME < @DATEEND@ --  AND SP.SCRAPTYPE IN (0, 2, 3)
-                             AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                             AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -616,7 +616,7 @@ SELECT
 												AND SP.SCRAPTYPE IN (0)
 												AND SP.AUDITDATE >= @DATEBEGIN@ 
 												AND SP.AUDITDATE < @DATEEND@ 
-                                                AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							                    AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							                    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							                    {TESTMOULDFLAG}
@@ -669,7 +669,7 @@ SELECT
 				AND SP.GOODSLEVELTYPEID = 9 
 				AND SP.SPECIALREPAIRTIME >= @DATEBEGIN@ 
 				AND SP.SPECIALREPAIRTIME < @DATEEND@ 
-                AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 				AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 				AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 				{TESTMOULDFLAG}
@@ -733,7 +733,7 @@ SELECT
                                        INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
                                       WHERE PD.CREATETIME >= @DATEBEGIN@
                                         AND PD.CREATETIME < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							            AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							            AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							            {TESTMOULDFLAG}
@@ -825,7 +825,7 @@ SELECT BAR.GOODSCODE,
                              INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
                              WHERE GH.FHUSERID IS NOT NULL
                                AND GH.FHTIME >= @DATEBEGIN@
-                                AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -910,7 +910,7 @@ SELECT BAR.GOODSCODE,
                              WHERE GH.FHUSERID IS NOT NULL
                                AND GH.FHTIME >= @DATEBEGIN@
                                AND GH.FHTIME < @DATEEND@ 
-                                AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -993,7 +993,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.AUDITDATE >= @DATEBEGIN@
                                         AND SP.AUDITDATE < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1074,7 +1074,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.BACKOUTTIME >= @DATEBEGIN@
                                         AND SP.BACKOUTTIME < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1153,7 +1153,7 @@ SELECT GOODSCODE,
 																				--AND SP.SCRAPTYPE = 1
                                                 AND SP.AUDITDATE >= @DATEBEGIN@
                                                 AND SP.AUDITDATE < @DATEEND@
-                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                 AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1256,7 +1256,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.AUDITDATE >= @DATEBEGIN@
                                         AND SP.AUDITDATE < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1337,7 +1337,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.BACKOUTTIME >= @DATEBEGIN@
                                         AND SP.BACKOUTTIME < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1418,7 +1418,7 @@ SELECT GOODSCODE,
 																				--AND SP.SCRAPTYPE = 1
                                                 AND SP.AUDITDATE >= @DATEBEGIN@
                                                 AND SP.AUDITDATE < @DATEEND@
-                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                 AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1522,7 +1522,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.AUDITDATE >= @DATEBEGIN@
                                         AND SP.AUDITDATE < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1603,7 +1603,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.BACKOUTTIME >= @DATEBEGIN@
                                         AND SP.BACKOUTTIME < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1684,7 +1684,7 @@ SELECT GOODSCODE,
 																				--AND SP.SCRAPTYPE = 1
                                                 AND SP.AUDITDATE >= @DATEBEGIN@
                                                 AND SP.AUDITDATE < @DATEEND@
-                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                 AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1787,7 +1787,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.AUDITDATE >= @DATEBEGIN@
                                         AND SP.AUDITDATE < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1841,7 +1841,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
+                                            TO_CHAR(SP.BACKOUTTIME, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1868,7 +1868,7 @@ SELECT GOODSCODE,
                                       WHERE SP.AUDITSTATUS = 1
                                         AND SP.BACKOUTTIME >= @DATEBEGIN@
                                         AND SP.BACKOUTTIME < @DATEEND@
-                                         AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                         AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
@@ -1949,7 +1949,7 @@ SELECT GOODSCODE,
 																				--AND SP.SCRAPTYPE = 1
                                                 AND SP.AUDITDATE >= @DATEBEGIN@
                                                 AND SP.AUDITDATE < @DATEEND@
-                                                 AND (G.GOODSID IN (0,0) OR '0,0' = '0,0') 
+                                                 AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')  
 							AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}