aa工序 分本烧 AA 重烧AA

wwwroot/mes/rpt/rpt.ashx

@@ -411,9 +411,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                    AND modeltype = -1
                                    and PROCEDUREID!=55
                                 UNION ALL
+                                SELECT 888
+                                      ,'888'
+                                      ,'本烧AA'
+                                  FROM dual
+                                UNION ALL
                                 SELECT 999
                                       ,'999'
-                                      ,'AA'
+                                      ,'重烧AA'
                                   FROM dual)
                             ",
                                 new CDAParameter("ACCOUNTID", accountId)

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -491,7 +491,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)				            
 									INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID 
 								WHERE
-								  PD.PROCEDUREID in ( 13 ,35)
+								  PD.PROCEDUREID = @PROCEDUREID@	-- in ( 13 ,35)
 								   --AND  PD.VALUEFLAG = '1'
 								  -- AND PD.CHECKBATCHNO = 1
 								   AND PD.createtime >= @DATEBEGIN@
@@ -518,7 +518,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)				            
 									INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID 
 								WHERE
-								   PD.PROCEDUREID in ( 13 ,35)
+								   PD.PROCEDUREID = @PROCEDUREID@	-- in ( 13 ,35)
 								   -- AND PD.VALUEFLAG = '1'
 								   -- AND PD.CHECKBATCHNO = 1
 								   AND PD.CREATETIME >= @DATEBEGIN@
@@ -593,7 +593,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										   AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)
 										 INNER JOIN TP_PC_GROUTINGLINE GL
 											ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
-										 WHERE PD.PROCEDUREID IN (13, 35)
+										 WHERE PD.PROCEDUREID = @PROCEDUREID@	-- IN (13, 35)
 										  -- AND PD.VALUEFLAG = '1'
 										   --AND PD.CHECKBATCHNO = 1
 										   AND PD.createtime >= @DATEBEGIN@
@@ -622,7 +622,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										   AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)
 										 INNER JOIN TP_PC_GROUTINGLINE GL
 											ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
-										 WHERE PD.PROCEDUREID IN (13, 35)
+										 WHERE PD.PROCEDUREID = @PROCEDUREID@	-- IN (13, 35)
 											  -- AND PD.VALUEFLAG = '1'
 											  -- AND PD.CHECKBATCHNO = 1
 										   AND PD.CREATETIME >= @DATEBEGIN@
@@ -739,7 +739,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlStr = sqlStr.Replace("@DATEBEGIN@", "to_date('" + Convert.ToDateTime(context.Request["datebeginMaster"]) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@DATEEND@", "to_date('" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@KILNID@", context.Request["kilnidMaster"].ToString() != "" ? context.Request["kilnidMaster"].ToString() : " NULL ");
-                sqlStr = sqlStr.Replace("@PROCEDUREID@", context.Request["procedureidMaster"].ToString() != "" ? context.Request["procedureidMaster"].ToString() : " NULL ");
+                string pid = context.Request["procedureidMaster"].ToString();
+                if (pid == "888")
+                {
+                    pid = "13";
+                }else if (pid == "999")
+                {
+                    pid = "35";
+                }
+                sqlStr = sqlStr.Replace("@PROCEDUREID@", pid != "" ? pid : " NULL ");
                 sqlStr = sqlStr.Replace("@GOODSCODE@", " '' ");
                 sqlStr = sqlStr.Replace("@GOODSNAME@", " '' ");
                 string nameGuid = string.Empty;

wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

@@ -25,20 +25,10 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
     {
         context.Response.ContentType = "text/plain";
         proc = context.Request["procedureidMaster"].ToString();
-        if (proc != "13" && proc != "35")
-        {
-            proc = "13,35";
-        }
+
         string fields = context.Request["fields"].ToString();
         int index = Convert.ToInt32(context.Request["index"] + "");
         string gs = context.Request["gs"].ToString();
-        //GOODSCODE: ""
-        //buildingnoMaster: "12"
-        //datebeginMaster: "2025-01-06 00:00:00"
-        //dateendMaster: "2025-06-06 23:59:59"
-        //goodsnameMaster: ""
-        //kilnidMaster: ""
-        //procedureidMaster: "13"
 
         #region 取缺陷拼接串
         string procedureId = "21,2,6,16,31,25,30,33,7,8,9";
@@ -336,7 +326,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
 				                PDD.GOODSID,
 				                PDD.REWORKPROCEDUREID    ) T where T.GOODSLEVELTYPEID = 20   and T.H_FLAG = 1 ";
                         }
-                       
+
 
                         sqlDetail += " order by T.Barcode ";
                         break;
@@ -654,7 +644,14 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                     }
 
             }
-
+            if (proc == "888")
+            {
+                proc = "13";
+            }
+            else if (proc == "999")
+            {
+                proc = "35";
+            }
             sqlDetail = sqlDetail.Replace("{DEFECT}", defectStr).Replace("{BUILDINGNO}", buding).Replace("{PROCEDUREID}", proc);
             //获取查询条件
             List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt014/rptnew_detail_change.ashx

@@ -26,18 +26,15 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
         proc = context.Request["procedureidMaster"].ToString();
         string fields = context.Request["fields"].ToString();
         string index = context.Request["index"].ToString();
-        string gs = context.Request["gs"].ToString();
-        if (proc != "13" && proc != "35")
+        string gs = context.Request["gs"].ToString(); 
+        if (proc == "888")
         {
-            proc = "13,35";
+            proc = "13";
         }
-        //GOODSCODE: ""
-        //buildingnoMaster: "12"
-        //datebeginMaster: "2025-01-06 00:00:00"
-        //dateendMaster: "2025-06-06 23:59:59"
-        //goodsnameMaster: ""
-        //kilnidMaster: ""
-        //procedureidMaster: "13"
+        else if (proc == "999")
+        {
+            proc = "35";
+        } 
 
         #region 取缺陷拼接串