产品合格数统计表 的 改判 修改

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -291,8 +291,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                            AND rpd.procedureid IN (20, 22, 23, 37, 41 )
                                    GROUP BY p.groutingdailydetailid,pdd.goodsleveltypeid ,pdd.PROCEDUREID  ,pdd.barcode  
 
-                         UNION ALL
-                          SELECT 4 FLAG
+                         UNION ALL 
+                          SELECT distinct 4 FLAG
                                     ,P.GROUTINGDAILYDETAILID,null  mpdid
                                     ,0 OUT_K_B
                                     ,0 OUT_K_R
@@ -308,8 +308,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                     ,0 END_RH
                                     ,0 END_ALL
                                     ,CASE
-                                   WHEN rpd.productiondataid IS NOT NULL AND rpd.goodsleveltypeid NOT IN (4, 5) 
-                                            and pds.productiondataid is null THEN
+                                   WHEN rpd.productiondataid IS NOT NULL AND rpd.goodsleveltypeid NOT IN (4, 5)  AND ppp.checkflag <> 3 
+                                          THEN
                                     1
                                    ELSE
                                     0
@@ -323,10 +323,11 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                     LEFT JOIN TP_PM_PRODUCTIONDATA PMAX
                                       ON PMAX.GROUTINGDAILYDETAILID = TP.GROUTINGDAILYDETAILID
                                      AND PMAX.PRODUCTIONDATAID < TP.PRODUCTIONDATAID 
-                                   WHERE TP.CHECKBATCHNO = 1
-                                    AND tp.valueflag = 1
-                                     AND TP.GOODSLEVELTYPEID IN (4, 5)
-                                     AND TP.PROCEDUREID = 13
+                        --   去除复检的质量登记
+                           LEFT JOIN tp_pm_productiondata_semicheck pds ON pds.productiondataid = tp.productiondataid  
+                                   WHERE  TP.GOODSLEVELTYPEID IN (4, 5)
+                                     AND TP.PROCEDUREID in( 13 ,35)
+                                     AND pds.productiondataid IS NULL
                                      AND TP.CREATETIME >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"'
                                      AND TP.CREATETIME <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"' 
                                         {strFactoryInspection}
@@ -337,75 +338,14 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                    GROUP BY TP.PRODUCTIONDATAID
                                            ,TP.GROUTINGDAILYDETAILID
                                            ,TP.PROCEDUREID) P
-                                     LEFT JOIN tp_pm_productiondata rpd
-                                        ON rpd.productiondataid = p.maxproductiondataid AND rpd.procedureid = 13
-                                    --   去除复检的质量登记
-                                     LEFT JOIN tp_pm_productiondata_semicheck pds ON pds.productiondataid = p.productiondataid
+                                     LEFT JOIN tp_pm_productiondata rpd  ON rpd.productiondataid = p.maxproductiondataid   
+                                     LEFT JOIN tp_pm_productiondata ppp  ON ppp.productiondataid = p.PRODUCTIONDATAID   
 -- 没有回收的数据
                                         where not exists ( select 1 from tp_pm_productiondata rpdd where  rpdd.GROUTINGDAILYDETAILID = p.GROUTINGDAILYDETAILID
-                                       AND rpdd.procedureid IN (20, 22, 23, 37, 35) AND rpdd.productiondataid < p.productiondataid
+                                       AND rpdd.procedureid IN (20, 22, 23, 37, 41) AND rpdd.productiondataid < p.productiondataid
                                        AND rpd.productiondataid < rpdd.productiondataid AND rpdd.valueflag = '1')
-                                   UNION ALL   
-                                    SELECT 5 FLAG
-                                            ,TP_PM_ProductionData.groutingdailydetailid,null  mpdid
-                                            ,0 OUT_K_B
-                                            ,0 OUT_K_R
-                                            ,0 OUT_K_ALL
-                                            ,0 OK_B
-                                            ,0 OK_R
-                                            ,0 OK_H
-                                            ,0 OK_RH
-                                            ,0 OK_ALL
-                                            ,0 END_B
-                                            ,0 END_R
-                                            ,0 END_H
-                                            ,0 END_RH
-                                            , 0 END_ALL
-                                            ,0 hgp
-                                            ,CASE
-                                               WHEN  rpd.productiondataid is null AND pds.productiondataid IS NULL   THEN
-                                                1
-                                               ELSE
-                                                0
-                                             END bzgp
-                                         from TP_PM_ProductionData 
-                                        INNER JOIN   (SELECT TP.PRODUCTIONDATAID
-                                                    ,TP.GROUTINGDAILYDETAILID
-                                                    ,TP.PROCEDUREID
-                                                    ,MAX(PMAX.PRODUCTIONDATAID) AS MAXPRODUCTIONDATAID
-                                                FROM TP_PM_PRODUCTIONDATA TP
-                                                LEFT JOIN TP_PM_PRODUCTIONDATA PMAX
-                                                  ON PMAX.GROUTINGDAILYDETAILID = TP.GROUTINGDAILYDETAILID
-                                                 AND PMAX.PRODUCTIONDATAID < TP.PRODUCTIONDATAID 
-                                                   AND pmax.procedureid = 13
-                                                AND pmax.goodsleveltypeid NOT IN (4, 5)
-                                               WHERE TP.CHECKBATCHNO = 1
-                                                AND tp.valueflag = 1
-                                                 AND TP.GOODSLEVELTYPEID IN (4, 5)
-                                                 AND TP.PROCEDUREID = 13
-                                                 AND TP.CREATETIME >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"'
-                                                 AND TP.CREATETIME <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"' 
-                                                    {strFactoryInspection}
-                                                 AND to_char(tp.createtime, 'YYYY-MM-DD') <> to_char(tp.checktime, 'YYYY-MM-DD')
-                                               GROUP BY TP.PRODUCTIONDATAID
-                                                       ,TP.GROUTINGDAILYDETAILID
-                                                       ,TP.PROCEDUREID) TP 
-                                         ON tp.groutingdailydetailid = tp_pm_productiondata.groutingdailydetailid
-                                                 AND tp.maxproductiondataid < 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, 41,35)
-                                           AND rpd.valueflag = '1'
-                                            -- 在质量登记 和 包装入库取消的数据之间 不能有 回收的数据
-                                           AND rpd.productiondataid < tp_pm_productiondata.productiondataid
-                                           AND tp.maxproductiondataid < rpd.productiondataid
-                                        --   去除复检的质量登记
-                                        LEFT JOIN tp_pm_productiondata_semicheck pds ON pds.productiondataid = tp.productiondataid
-                                where TP_PM_ProductionData.ValueFlag = '0'
-                                  and TP_PM_ProductionData.ProcedureID = 15 
-                                  and TP_PM_ProductionData.CREATETIME>= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"' 
-                                  and TP_PM_ProductionData.CREATETIME<= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"'   ) ";
+ 
+) ";
 
                     if (sqltmp.Contains("{strFactoryInspection}"))
                     {
@@ -443,8 +383,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                       ,T.包装数_本烧回收  
                       ,T.包装数_重烧
                       ,T.包装数_重烧回收               
-                      
-                      ,t.合格数_改判 - t.包装数_改判 包装数_改判,(T.包装数_本烧 + T.包装数_重烧 +T.包装数_本烧回收+T.包装数_重烧回收 +t.合格数_改判 - t.包装数_改判) 包装数_合计
+                      ,T.合格数_改判 包装数_改判,T.合格数_合计 包装数_合计
+                     -- ,t.合格数_改判 - t.包装数_改判 包装数_改判,(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
@@ -468,8 +408,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                               ,SUM(TF.END_R) 包装数_重烧
                               ,SUM(TF.END_H) 包装数_本烧回收
                               ,SUM(TF.END_RH) 包装数_重烧回收
-                             ,SUM(TF.bzgp) 包装数_改判
-                              ,SUM(tf.end_b+tf.end_r+tf.end_h+TF.bzgp) 包装数_合计
+                             ,SUM(TF.hgp) 包装数_改判
+                              ,SUM(tf.end_b+tf.end_r+tf.end_h+TF.hgp) 包装数_合计
                                  FROM TMP_PROD_HG_BZ  TF
                           LEFT JOIN TP_PM_GROUTINGDAILYDETAIL G
                             ON TF.GROUTINGDAILYDETAILID = G.GROUTINGDAILYDETAILID
@@ -550,8 +490,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                               ,SUM(TF.END_R) 包装数_重烧
                               ,SUM(TF.END_H) 包装数_本烧回收
                               ,SUM(TF.END_RH) 包装数_重烧回收
-                                ,SUM(tf.bzgp) 包装数_改判
-                              ,SUM(tf.end_b+tf.end_r+tf.end_h+TF.bzgp) 包装数_合计
+                                ,SUM(tf.hgp) 包装数_改判
+                              ,SUM(tf.end_b+tf.end_r+tf.end_h+TF.hgp) 包装数_合计
                           FROM  TMP_PROD_HG_BZ TF
                           LEFT JOIN TP_PM_GROUTINGDAILYDETAIL G
                             ON TF.GROUTINGDAILYDETAILID = G.GROUTINGDAILYDETAILID
@@ -684,7 +624,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 								SUM(END_B)包装数_本烧,
 								SUM(END_R)包装数_重烧,
 								SUM(END_H)包装数_回收,
-                                SUM(bzgp) 包装数_改判,
+                                SUM(hgp) 包装数_改判,
 								SUM(END_ALL) 包装数_合计
                                FROM  AJZ_RPT008
                                WHERE BUILDINGNO NOT LIKE '%合计%'
@@ -741,7 +681,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 								SUM(END_B)包装数_本烧,
 								SUM(END_R)包装数_重烧,
 								SUM(END_H)包装数_回收,
-                                SUM(bzgp) 包装数_改判,
+                                SUM(hgp) 包装数_改判,
 								SUM(END_ALL) 包装数_合计
                          FROM  AJZ_RPT008
                          WHERE BUILDINGNO NOT LIKE '%合计%'

wwwroot/mes/rpt/rpt008/rptnew_detail.ashx

@@ -265,6 +265,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)  order by pdd.Barcode  ";
                         break;
                     }
+                case "包装数_改判":
                 case "合格数_改判":
                     {
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  rpd.Barcode  产品条码 
@@ -276,10 +277,11 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                     LEFT JOIN TP_PM_PRODUCTIONDATA PMAX
                                       ON PMAX.GROUTINGDAILYDETAILID = TP.GROUTINGDAILYDETAILID
                                      AND PMAX.PRODUCTIONDATAID < TP.PRODUCTIONDATAID 
-                                   WHERE TP.CHECKBATCHNO = 1
-                                     AND tp.valueflag = 1
-                                     AND TP.GOODSLEVELTYPEID IN (4, 5)
-                                     AND TP.PROCEDUREID = 13
+ --   去除复检的质量登记
+                           LEFT JOIN tp_pm_productiondata_semicheck pds ON pds.productiondataid = tp.productiondataid  
+                                   WHERE   TP.GOODSLEVELTYPEID IN (4, 5)
+                                     AND TP.PROCEDUREID  in( 13 ,35)
+                                     AND pds.productiondataid IS NULL
                                      AND TP.createtime >= @DATEBEGIN@
                                      AND TP.createtime < @DATEEND@ 
                                      AND (TP.checktime < @DATEBEGIN@ or TP.checktime > @DATEEND@ )                                     
@@ -288,10 +290,9 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                    GROUP BY TP.PRODUCTIONDATAID
                                            ,TP.GROUTINGDAILYDETAILID
                                            ,TP.PROCEDUREID) P
-                                     LEFT JOIN tp_pm_productiondata rpd
-                                        ON rpd.productiondataid = p.maxproductiondataid AND rpd.procedureid = 13
-                                    --   去除复检的质量登记
-                                     LEFT JOIN tp_pm_productiondata_semicheck pds ON pds.productiondataid = p.productiondataid 
+                                     LEFT JOIN tp_pm_productiondata rpd  ON rpd.productiondataid = p.maxproductiondataid  
+                                    LEFT JOIN tp_pm_productiondata ppp  ON ppp.productiondataid = p.PRODUCTIONDATAID   
+
                                   LEFT JOIN TP_PM_GROUTINGDAILYDETAIL G
 									ON p.GROUTINGDAILYDETAILID = G.GROUTINGDAILYDETAILID
 								  LEFT JOIN TP_PC_GROUTINGLINE L
@@ -302,16 +303,14 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 									ON G.LOGOID = O.LOGOID
 								  LEFT JOIN TP_MST_GOODS M
 									ON G.GOODSID = M.GOODSID
-                                WHERE rpd.PROCEDUREID = 13  
-								   AND rpd.GOODSCODE IN( '" + gs + @"' ) 
+                                WHERE  rpd.GOODSCODE IN( '" + gs + @"' ) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
   AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL) 
-                                   and  rpd.productiondataid IS NOT NULL AND rpd.goodsleveltypeid NOT IN (4, 5) 
-                                   and pds.productiondataid is null 
+                                   and  rpd.productiondataid IS NOT NULL AND rpd.goodsleveltypeid NOT IN (4, 5)  AND ppp.checkflag <> 3                             
                                    and  not exists ( select 1 from tp_pm_productiondata rpdd where  rpdd.GROUTINGDAILYDETAILID = p.GROUTINGDAILYDETAILID
                                        AND rpdd.procedureid IN (20, 22, 23, 37, 35) AND rpdd.productiondataid < p.productiondataid
                                        AND rpd.productiondataid < rpdd.productiondataid AND rpdd.valueflag = '1')  order by rpd.Barcode  ";
@@ -322,7 +321,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 
 
 
-                case "包装数_改判":
+                case "包装数_改判----------":
                     {
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  TP_PM_ProductionData.Barcode  产品条码 
                                   from TP_PM_ProductionData