|
|
@@ -96,7 +96,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
,T.包装数_重烧
|
|
|
,T.包装数_回收
|
|
|
,T.包装数_合计
|
|
|
- ,T.包装数_改判
|
|
|
+ ,t.合格数_改判 - t.包装数_改判 包装数_改判
|
|
|
FROM (SELECT GROUPING_ID(L.BUILDINGNO, M.GOODSID, D.DICTIONARYVALUE, O.LOGONAME) AS GID
|
|
|
,L.BUILDINGNO AS 楼号
|
|
|
,M.GOODSID AS 产品ID
|
|
|
@@ -334,7 +334,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
0 END_ALL
|
|
|
,0 hgp
|
|
|
,CASE
|
|
|
- WHEN to_char(tp.createtime, 'YYYY-MM-DD') <> to_char(tp_pm_productiondata.createtime, 'YYYY-MM-DD') THEN
|
|
|
+ WHEN rpd.productiondataid is null and
|
|
|
+ to_char(tp.createtime, 'YYYY-MM-DD') <> to_char(tp_pm_productiondata.createtime, 'YYYY-MM-DD') THEN
|
|
|
1
|
|
|
ELSE
|
|
|
0
|
|
|
@@ -344,7 +345,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
and tp.valueflag = '0'
|
|
|
AND TP.PROCEDUREID IN (15)
|
|
|
AND tp.productiondataid < tp_pm_productiondata.productiondataid
|
|
|
-
|
|
|
+ --去除 重烧 研磨 直接冷补 研磨后冷补 堵漏气 的回收数据
|
|
|
+ LEFT JOIN tp_pm_productiondata rpd
|
|
|
+ ON rpd.groutingdailydetailid = tp_pm_productiondata.groutingdailydetailid
|
|
|
+ AND rpd.procedureid IN (20, 22, 23, 37,35)
|
|
|
+ AND rpd.valueflag = '1'
|
|
|
+ -- 在质量登记 和 包装入库取消的数据之间 不能有 回收的数据
|
|
|
+ AND rpd.productiondataid < tp_pm_productiondata.productiondataid
|
|
|
+ AND tp.productiondataid < rpd.productiondataid
|
|
|
+
|
|
|
where TP_PM_ProductionData.ValueFlag = '1'
|
|
|
and TP_PM_ProductionData.ProcedureID = 15
|
|
|
and TP_PM_ProductionData.CREATETIME>@DATEBEGIN@
|
