|
|
@@ -43,7 +43,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
pd.CHECKBATCHNO
|
|
|
FROM
|
|
|
TP_PM_PRODUCTIONDATA PD
|
|
|
-
|
|
|
+ -- 去除复检的质量登记
|
|
|
+ LEFT JOIN tp_pm_productiondata_semicheck pds
|
|
|
+ ON pds.productiondataid = pd.productiondataid
|
|
|
LEFT JOIN TP_MST_GOODS TMG ON PD.GOODSID = TMG.GOODSID
|
|
|
LEFT JOIN TP_MST_DATADICTIONARY TMD ON TMG.GLAZETYPEID = TMD.DICTIONARYID
|
|
|
AND TMD.DictionaryType = 'TPC002'
|
|
|
@@ -67,7 +69,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
AND pmax.productiondataid < tp.productiondataid
|
|
|
AND pmax.checkflag IS NOT NULL
|
|
|
AND pmax.procedureid = tp.procedureid
|
|
|
- WHERE tp.checkflag <> 1
|
|
|
+ WHERE tp.checkflag <> 1 and tp.procedureid in (13,35)
|
|
|
AND to_char(pmax.createtime, 'yyyy-mm-dd') < to_char(tp.createtime, 'yyyy-mm-dd')
|
|
|
|
|
|
" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where tp.CREATETIME >= thc.DAY_YMD_START and tp.CREATETIME < thc.DAY_YMD_END ) " : " ") + @"
|
|
|
@@ -94,8 +96,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
LEFT JOIN TP_SYS_GOODSLEVELTYPE TSGL2 ON PD2.GOODSLEVELTYPEID = TSGL2.GOODSLEVELTYPEID
|
|
|
LEFT JOIN TP_PC_GROUTINGLINE GRO ON GRO.GROUTINGLINEID = PD.GROUTINGLINEID
|
|
|
LEFT JOIN TP_PM_DEFECT DEFECT ON DEFECT.BARCODE = PD.BARCODE
|
|
|
- WHERE PD.CHECKFLAG <> 1 and not exists ( select 1 from tp_pm_productiondata rpd where rpd.groutingdailydetailid = pd.groutingdailydetailid
|
|
|
- AND rpd.procedureid IN (20, 22, 23, 37, 35) AND rpd.productiondataid < pd.productiondataid
|
|
|
+ WHERE PD.CHECKFLAG <> 1 and pd.procedureid in (13,35) AND pds.productiondataid IS NULL and not exists ( select 1 from tp_pm_productiondata rpd where rpd.groutingdailydetailid = pd.groutingdailydetailid
|
|
|
+ AND rpd.procedureid IN (20, 22, 23, 37, 41) AND rpd.productiondataid < pd.productiondataid
|
|
|
AND pd2.productiondataid < rpd.productiondataid AND rpd.valueflag = '1' AND rpd.createtime < pd.createtime
|
|
|
AND pd2.createtime < rpd.createtime) AND to_char( PD2.CREATETIME, 'yyyy-mm-dd' ) < to_char( PD.CREATETIME, 'yyyy-mm-dd' )
|
|
|
|
