姜永辉 4 месяцев назад
Родитель
Сommit
23b98050b5
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      wwwroot/mes/rpt/rpt014/rptnew.ashx
  2. 1 1
      wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

+ 2 - 2
wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -232,7 +232,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            AND (PD.KILNID = " + (string.IsNullOrEmpty(context.Request["kilnidMaster"] + "") ? "''" : context.Request["kilnidMaster"]) + @" OR " + (string.IsNullOrEmpty(context.Request["kilnidMaster"] + "") ? "''" : context.Request["kilnidMaster"]) + @" IS NULL) 
                             AND PD.GOODSCODE IN( " + goodssql + @")
                            AND GL.BUILDINGNO " + buding + @" 
-							 AND pd.goodsleveltypeid <> 4
+							--  AND pd.goodsleveltypeid <> 4
 							 GROUP BY  PD.GROUTINGDAILYDETAILID  
 							)  P
 							-- 缺陷工序分组的 工序id1 工序id2 对应
@@ -248,7 +248,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									--xuwei 2020-09-01 add 重烧的没有责任工序也算 
 									-- 20250417 改为用 是否走过 tp_mst_defectgroup 缺陷工序分组的 工序id1 工序id2 为基准
 									pdp.procedureid1 = ppdg.procedureid OR pdp.procedureid2 = ppdg.procedureid
-								) 
+								)  where  pp.goodsleveltypeid <> 4
 			              ) ";
 
                     if (sqltmp.Contains("{strFactoryInspectionCheckTime}"))

+ 1 - 1
wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

@@ -625,7 +625,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                                    AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL) 
                                                     AND PD.GOODSCODE IN  ( '" + gs + @"')
                                                    AND GL.BUILDINGNO {BUILDINGNO} 
-                                                        AND pd.goodsleveltypeid <> 4
+                                                     --   AND pd.goodsleveltypeid <> 4
 							                         GROUP BY  PD.GROUTINGDAILYDETAILID   
 							                        )  P
 							                -- 缺陷工序分组的 工序id1 工序id2 对应