配了 缺陷分组表后还原原来的逻辑

wwwroot/mes/rpt/rpt014/rpt.ashx

@@ -306,19 +306,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				            AND ( 
 									( PDP.PROCEDUREID1 = PR.PROCEDUREID OR PDP.PROCEDUREID2 = PR.PROCEDUREID )
 									--xuwei 2020-09-01 add 重烧的没有责任工序也算
-									  OR (@PROCEDUREID@ = 35 and d.defectprocedureid is null)
-                                    OR  (@PROCEDUREID@ = 13 and d.defectprocedureid is null)
+									OR @PROCEDUREID@ = 35
 								) 
 			            WHERE
 				            P.VALUEFLAG = '1'
                             AND P.PROCEDUREID = @PROCEDUREID@
                             AND P.CHECKBATCHNO = 1
-							--xuwei fix 2020-10-09 begin  20250414 石磊 以pc客户端的为主
-
-                            --AND P.CHECKTIME >= @DATEBEGIN@
-                            --AND P.CHECKTIME < @DATEEND@
-                            AND P.CREATETIME >= @DATEBEGIN@
-                            AND P.CREATETIME < @DATEEND@
+							--xuwei fix 2020-10-09 begin
+                            AND P.CHECKTIME >= @DATEBEGIN@
+                            AND P.CHECKTIME < @DATEEND@
+                            --AND P.CREATETIME >= @DATEBEGIN@
+                            --AND P.CREATETIME < @DATEEND@
 							--xuwei fix 2020-10-09 end 
 
                             AND P.GOODSLEVELTYPEID <> 4
@@ -543,8 +541,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				            AND ( 
 									( PDP.PROCEDUREID1 = PR.PROCEDUREID OR PDP.PROCEDUREID2 = PR.PROCEDUREID )
 									--xuwei 2020-09-01 add 重烧的没有责任工序也算
-									  OR (@PROCEDUREID@ = 35 and d.defectprocedureid is null)
-                                    OR  (@PROCEDUREID@ = 13 and d.defectprocedureid is null)
+									OR @PROCEDUREID@ = 35
 								) 
 			            WHERE
 				            P.VALUEFLAG = '1'