Kezdőlap Felfedezés Súgó
Bejelentkezés
DK-MES-2.0
/
HEGII.ss.mes.web
6
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

Merge branch 'master' of http://git.dongkesoft.cn:8000/MES/HEGII.ss.mes.web

chenxy 2 éve
szülő
fe9589ad6c ec1887fcc2
commit
9b9bab1c7c
11 módosított fájl, 215 hozzáadás és 321 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. BIN
      wwwroot/Img/hegii2.png
  2. BIN
      wwwroot/Img/hegii3.png
  3. BIN
      wwwroot/Img/top_bg_blue.png
  4. 4 4
      wwwroot/Plugins/xeasyui/xuwell.css
  5. 3 3
      wwwroot/mes/main.html
  6. 30 37
      wwwroot/mes/rpt/rpt125/rpt.ashx
  7. 24 31
      wwwroot/mes/rpt/rpt126/rpt.ashx
  8. 14 20
      wwwroot/mes/rpt/rpt155/rpt.ashx
  9. 100 154
      wwwroot/mes/rpt/rpt351/rpt.ashx
  10. 14 32
      wwwroot/mes/rpt2/rpt8001/rpt.ashx
  11. 26 40
      wwwroot/mes/rpt2/rpt8006/rpt.ashx

BIN
wwwroot/Img/hegii2.png
Fájl Megtekintése


BIN
wwwroot/Img/hegii3.png
Fájl Megtekintése


BIN
wwwroot/Img/top_bg_blue.png
Fájl Megtekintése


+ 4 - 4
wwwroot/Plugins/xeasyui/xuwell.css
Fájl Megtekintése 

@@ -25,17 +25,17 @@ a {
 
     a:hover {
 
         color: dodgerblue;
 
         text-decoration: underline;
 
-        outline-color: #AA0000;
 
+        outline-color: #313777;
 
     }
 
 
     a:link {
 
-        outline-color: #AA0000;
 
+        outline-color: #313777;
 
     }
 
 
 
 /*树，表格 选中光带颜色*/
 
 .tree-node-selected, .datagrid-row-selected {
 
-    background-color: #AA0000;
 
+    background-color: #313777;
 
 }
 
 
 /*按钮选中颜色*/
 
@@ -219,7 +219,7 @@ a {
 
     border:1px dotted lightgray;
 
     border-radius:5px;
 
     padding:4px;
 
-    background-color:#AA0000;
 
+    background-color:#313777;
 
 }
 
 /*所有文本框，目前版本无效，依赖于页面中的 style 相同定义*/
 
 .w-input {

+ 3 - 3
wwwroot/mes/main.html
Fájl Megtekintése 

@@ -10,11 +10,11 @@
 
 </head>
 
 <body class="easyui-layout">
 
     <!--页头-->
 
-    <div data-options="region:'north'" style="height:50px;background-image:url('/img/top_bg.png');background-position-y:center;">
 
+    <div data-options="region:'north'" style="height:50px;background-image:url('/img/top_bg_blue.png');background-position-y:center;">
 
         <div style="display:flex;">
 
             <div style="">
 
-                <img src="/img/logo3.png" style="height:30px;position:absolute;top:8px;left:10px;" />
 
-                <span style="font-size:20px;position:absolute;top:12px;left:50px;"><span style="font-weight:600;">东科软件 <font color="red">D</font>ONG<font color="red">K</font>E iBOSS-MES</span> </span>
 
+                <img src="/img/hegii2.png" style="height:20px;position:absolute;top:15px;left:10px;" />
 
+                <span style="font-size:20px;position:absolute;top:12px;left:170px;font-weight:600"> MES-BI </span>
 
             </div>
 
             <div style="margin-left:auto;padding:5px;">
 
                 <!--<a href="javascript:$('#tree').layout();">测试</a>-->

+ 30 - 37
wwwroot/mes/rpt/rpt125/rpt.ashx
Fájl Megtekintése 

@@ -111,43 +111,36 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                                    AND (@goodscode@ IS NULL OR pd.goodscode LIKE '%' || @goodscode@ || '%')
 
                                    AND (@KilnID@ IS NULL OR pd.KilnID = @KilnID@)
 
                                 UNION ALL
 
-                                SELECT T.GOODSLEVELTYPEID,
 
-                                       T.BARCODE,
 
-                                       T.PRODUCTIONLINEID,
 
-                                       T.GOODSID,
 
-                                       T.KILNID,
 
-                                       T.KILNCARBATCHNO,
 
-                                       T.PROCEDUREID,
 
-                                       1 AS CC
 
-                                  FROM (SELECT ppd.GOODSLEVELTYPEID,
 
-                                               dd.BARCODE,
 
-                                               dd.PRODUCTIONLINEID,
 
-                                               dd.GOODSID,
 
-                                               ppd.KILNID,
 
-                                               ppd.KILNCARBATCHNO,
 
-                                               dd.defectprocedureid as procedureid,
 
-                                               RANK() OVER(PARTITION BY dd.BARCODE, ppd.KILNID ORDER BY dd.PRODUCTIONDATAID DESC) AS RK
 
-                                          FROM (select pd.productiondataid
 
-                                                            ,pd.goodsleveltypeid
 
-                                                           ,pd.kilnid
 
-                                                           ,pd.kilncarbatchno
 
-                                                        from tp_pm_productiondata pd
 
-                                                         WHERE PD.VALUEFLAG = '1'
 
-                                                           AND PD.MODELTYPE IN (-1, -4, -5)
 
-                                                           AND PD.ACCOUNTID = @accountid@
 
-                                                           AND LENGTH(PD.KILNCARBATCHNO) > 0
 
-                                                           AND pd.createtime >= @createtimestart@
 
-                                                           AND pd.createtime < @createtimeend@
 
-                                                           AND (@goodscode@ IS NULL OR pd.goodscode LIKE '%' || @goodscode@ || '%')
 
-                                                           AND (@KilnID@ IS NULL OR pd.KilnID = @KilnID@)
 
-                                                           AND EXISTS (SELECT 1
 
-                                                                  FROM tp_pm_productiondata outpd
 
-                                                                 WHERE outpd.barcode = pd.barcode
 
-                                                                   AND outpd.procedureid = @rptsprocedureid@
 
-                                                                   AND outpd.valueflag = '1'
 
-                                                                   AND outpd.kilncarbatchno = pd.kilncarbatchno)) ppd
 
-                                 INNER JOIN tp_pm_defect dd
 
-                                    ON dd.productiondataid = ppd.productiondataid) T WHERE T.RK <= 1 ) ppcc
 
+                                SELECT PPD.GOODSLEVELTYPEID,
 
+                                       DD.BARCODE,
 
+                                       DD.PRODUCTIONLINEID,
 
+                                       DD.GOODSID,
 
+                                       PPD.KILNID,
 
+                                       PPD.KILNCARBATCHNO,
 
+                                       DD.DEFECTPROCEDUREID AS PROCEDUREID,
 
+                                       1                    AS CC
 
+                                  FROM (SELECT PD.PRODUCTIONDATAID,
 
+                                               PD.GOODSLEVELTYPEID,
 
+                                               PD.KILNID,
 
+                                               PD.KILNCARBATCHNO
 
+                                          FROM TP_PM_PRODUCTIONDATA PD
 
+                                         WHERE PD.VALUEFLAG = '1'
 
+                                           AND PD.MODELTYPE IN (-1, -4, -5)
 
+                                           AND PD.CHECKBATCHNO = 1
 
+                                           AND PD.ACCOUNTID = @accountid@
 
+                                           AND LENGTH(PD.KILNCARBATCHNO) > 0
 
+                                           AND PD.CREATETIME >= @createtimestart@
 
+                                           AND PD.CREATETIME < @createtimeend@
 
+                                           AND (@goodscode@ IS NULL OR PD.GOODSCODE LIKE '%' || @goodscode@ || '%')
 
+                                           AND (@KilnID@ IS NULL OR PD.KILNID = @KilnID@)
 
+                                           AND EXISTS (SELECT 1
 
+                                                  FROM TP_PM_PRODUCTIONDATA OUTPD
 
+                                                 WHERE OUTPD.BARCODE = PD.BARCODE
 
+                                                   AND OUTPD.PROCEDUREID = @rptsprocedureid@
 
+                                                   AND OUTPD.VALUEFLAG = '1'
 
+                                                   AND OUTPD.KILNCARBATCHNO = PD.KILNCARBATCHNO)) PPD
 
+                                 INNER JOIN TP_PM_DEFECT DD
 
+                                    ON DD.PRODUCTIONDATAID = PPD.PRODUCTIONDATAID) PPCC
 
                          INNER JOIN tp_pm_productiondata pdata
 
                             ON pdata.barcode = ppcc.barcode
 
                            AND ((pdata.modeltype <> 5) OR (pdata.modeltype = 5 AND pdata.specialrepairflag = '0'))

+ 24 - 31
wwwroot/mes/rpt/rpt126/rpt.ashx
Fájl Megtekintése 

@@ -116,38 +116,31 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                                    AND (@KilnID@ IS NULL OR pd.KilnID = @KilnID@)
 
 																	 and (@rptsprocedureid@ =  11 and pd.kilncarbatchno = pd2.kilncarbatchno or @rptsprocedureid@ = 58 and pd.kilncarbatchno <> pd2.kilncarbatchno)
 
                                 UNION ALL
 
-                                SELECT T.GOODSLEVELTYPEID,
 
-                                       T.BARCODE,
 
-                                       T.PRODUCTIONLINEID,
 
-                                       T.GOODSID,
 
-                                       T.KILNID,
 
-                                       T.KILNCARBATCHNO,
 
+                                SELECT PD.GOODSLEVELTYPEID,
 
+                                       PD.BARCODE,
 
+                                       PD.PRODUCTIONLINEID,
 
+                                       PD.GOODSID,
 
+                                       PD.KILNID,
 
+                                       PD.KILNCARBATCHNO,
 
                                        1 AS CC
 
-                                  FROM (SELECT PD.GOODSLEVELTYPEID,
 
-                                               PD.BARCODE,
 
-                                               PD.PRODUCTIONLINEID,
 
-                                               PD.GOODSID,
 
-                                               PD.KILNID,
 
-                                               PD.KILNCARBATCHNO,
 
-                                               RANK() OVER(PARTITION BY PD.BARCODE, pd.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-                                          FROM tp_pm_productiondata pd
 
-									     INNER JOIN TP_PM_PRODUCTIONDATA pd2
 
-                                            on Pd.barcode = pd2.barcode and pd2.PROCEDUREid IN (5,101)
 
-                                         WHERE PD.VALUEFLAG = '1'
 
-                                           AND PD.MODELTYPE IN (-1, -4, -5)
 
-                                           AND PD.ACCOUNTID = @accountid@
 
-                                           AND LENGTH(PD.KILNCARBATCHNO) > 0
 
-                                           AND pd.createtime >= @createtimestart@
 
-                                           AND pd.createtime < @createtimeend@
 
-                                           AND (@GoodsIDS@ IS NULL OR instr(','||@GoodsIDS@||',', ','||pd.GoodsId||',') > 0)
 
-                                           --AND pd.ProductionLineId = @ProductionLineID@ --生产线
 
-                                           AND (@GroutingUserIDS@ IS NULL OR instr(','||@GroutingUserIDS@||',', ','||pd.groutinguserid||',') > 0)
 
-                                           AND (@GroutingLineIDS@ IS NULL OR instr(','||@GroutingLineIDS@||',', ','||pd.groutinglineid||',') > 0)
 
-                                           AND (@KilnID@ IS NULL OR pd.KilnID = @KilnID@)
 
-                                           AND ((@rptsprocedureid@ <> 58 AND pd.isrefire = '0') OR
 
-                                               (@rptsprocedureid@ = 58 AND pd.isrefire = '6'))
 
-										   and (@rptsprocedureid@ = 11 and pd.kilncarbatchno = pd2.kilncarbatchno or @rptsprocedureid@ = 58 and pd.kilncarbatchno <> pd2.kilncarbatchno)
 
-                                        ) T WHERE T.RK <= 1 
+                                  FROM tp_pm_productiondata pd
 
+								 INNER JOIN TP_PM_PRODUCTIONDATA pd2
 
+                                    on Pd.barcode = pd2.barcode and pd2.PROCEDUREid IN (5,101)
 
+                                 WHERE PD.VALUEFLAG = '1'
 
+                                   AND PD.MODELTYPE IN (-1, -4, -5)
 
+                                   AND PD.CHECKBATCHNO = 1
 
+                                   AND PD.ACCOUNTID = @accountid@
 
+                                   AND LENGTH(PD.KILNCARBATCHNO) > 0
 
+                                   AND pd.createtime >= @createtimestart@
 
+                                   AND pd.createtime < @createtimeend@
 
+                                   AND (@GoodsIDS@ IS NULL OR instr(','||@GoodsIDS@||',', ','||pd.GoodsId||',') > 0)
 
+                                 --AND pd.ProductionLineId = @ProductionLineID@ --生产线
 
+                                   AND (@GroutingUserIDS@ IS NULL OR instr(','||@GroutingUserIDS@||',', ','||pd.groutinguserid||',') > 0)
 
+                                   AND (@GroutingLineIDS@ IS NULL OR instr(','||@GroutingLineIDS@||',', ','||pd.groutinglineid||',') > 0)
 
+                                   AND (@KilnID@ IS NULL OR pd.KilnID = @KilnID@)
 
+                                   AND ((@rptsprocedureid@ <> 58 AND pd.isrefire = '0') OR
 
+                                       (@rptsprocedureid@ = 58 AND pd.isrefire = '6'))
 
+								   and (@rptsprocedureid@ = 11 and pd.kilncarbatchno = pd2.kilncarbatchno or @rptsprocedureid@ = 58 and pd.kilncarbatchno <> pd2.kilncarbatchno)
 
             --add 20220222 加列重烧损坯 本烧统计 begin
 
                                 UNION ALL
 
                                 SELECT DISTINCT 999 goodsleveltypeid

+ 14 - 20
wwwroot/mes/rpt/rpt155/rpt.ashx
Fájl Megtekintése 

@@ -266,25 +266,20 @@ FROM
 
             sqlPara.Add(new CDAParameter("KilnID", context.Request["kilncode"].ToString(), DataType.VarChar));
 
         }
 
         sqlString = @" UNION ALL
 
-                    SELECT T.GOODSLEVELTYPEID,
 
-                           T.BARCODE,
 
-                           T.PRODUCTIONLINEID,
 
-                           T.GOODSID,
 
-                           T.KILNID,
 
+                    SELECT PD.GOODSLEVELTYPEID,
 
+                           PD.BARCODE,
 
+                           PD.PRODUCTIONLINEID,
 
+                           PD.GOODSID,
 
+                           PD.KILNID,
 
                            1 AS CC
 
-                      FROM (SELECT PD.GOODSLEVELTYPEID,
 
-                                   PD.BARCODE,
 
-                                   PD.PRODUCTIONLINEID,
 
-                                   PD.GOODSID,
 
-                                   PD.KILNID,
 
-                                   RANK() OVER(PARTITION BY PD.BARCODE, pd.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-                              FROM TP_PM_PRODUCTIONDATA PD
 
-                             INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-                                ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-                             WHERE PD.VALUEFLAG = '1'
 
-                               AND PD.MODELTYPE IN (-1, -4, -5)
 
-                               AND PD.ACCOUNTID = @in_AccountID@
 
-                               AND LENGTH(PD.KILNCARBATCHNO) > 0 ";
 
+                      FROM TP_PM_PRODUCTIONDATA PD
 
+                     INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
+                        ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
+                     WHERE PD.VALUEFLAG = '1'
 
+                       AND PD.MODELTYPE IN (-1, -4, -5)
 
+                       AND PD.CHECKBATCHNO = 1
 
+                       AND PD.ACCOUNTID = @in_AccountID@
 
+                       AND LENGTH(PD.KILNCARBATCHNO) > 0 ";
 
 
         selSql.Append(sqlString);
 
         if (!string.IsNullOrEmpty(context.Request["datebeginMaster"]))
 
@@ -308,8 +303,7 @@ FROM
 
         {
 
             selSql.Append("   AND pd.KilnID = @KilnID@ ");
 
         }
 
-        sqlString = @" AND ( ( @in_rptSprocedureId@ <> 58 AND pd.isrefire = '0' ) OR ( @in_rptSprocedureId@ = 58 AND pd.isrefire = '6' ) ) 
-) T WHERE T.RK <= 1) ppcc
 
+        sqlString = @" AND ( ( @in_rptSprocedureId@ <> 58 AND pd.isrefire = '0' ) OR ( @in_rptSprocedureId@ = 58 AND pd.isrefire = '6' ) ) ) ppcc
 
 INNER JOIN tp_pc_productionline pcpl ON pcpl.productionlineid = ppcc.productionlineid
 
 INNER JOIN tp_mst_kiln mstkiln ON mstkiln.kilnid = ppcc.kilnid
 
 INNER JOIN tp_mst_goods mstgoods ON mstgoods.goodsid = ppcc.goodsid

+ 100 - 154
wwwroot/mes/rpt/rpt351/rpt.ashx
Fájl Megtekintése 

@@ -787,23 +787,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 0) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
-						WHERE INSTR( gt.GOODSTYPECODE, '001002' ) = 1 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+				       INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE INSTR( gt.GOODSTYPECODE, '001002' ) = 1 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '0'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -827,23 +821,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 6) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
-						WHERE INSTR( gt.GOODSTYPECODE, '001002' ) = 1 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE INSTR( gt.GOODSTYPECODE, '001002' ) = 1 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '6'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -1740,23 +1728,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 0) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
-						WHERE (INSTR( p.GROUTINGLINECODE, 'B' ) = 1 or (INSTR( p.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( gt.GOODSTYPECODE, '001001' ) = 1 ))
 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE (INSTR( p.GROUTINGLINECODE, 'B' ) = 1 or (INSTR( p.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( gt.GOODSTYPECODE, '001001' ) = 1 ))
 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '0'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -1780,23 +1762,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 6) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
-						WHERE (INSTR( p.GROUTINGLINECODE, 'B' ) = 1 or (INSTR( p.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( gt.GOODSTYPECODE, '001001' ) = 1 ))
 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE (INSTR( p.GROUTINGLINECODE, 'B' ) = 1 or (INSTR( p.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( gt.GOODSTYPECODE, '001001' ) = 1 ))
 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '6'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -2598,24 +2574,18 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND INSTR(PD.GROUTINGLINECODE, 'C') = 1
 
-									   AND INSTR(PD.GROUTINGLINECODE, 'A') = 4
 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 0) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+                         AND INSTR(P.GROUTINGLINECODE, 'C') = 1
 
+						 AND INSTR(P.GROUTINGLINECODE, 'A') = 4
 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '0'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -2639,24 +2609,18 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND INSTR(PD.GROUTINGLINECODE, 'C') = 1
 
-									   AND INSTR(PD.GROUTINGLINECODE, 'A') = 4
 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 6) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND INSTR(P.GROUTINGLINECODE, 'C') = 1
 
+						 AND INSTR(P.GROUTINGLINECODE, 'A') = 4
 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '6'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -3460,24 +3424,18 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND INSTR( PD.GROUTINGLINECODE, 'A' ) = 1 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 0) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
 						WHERE INSTR( gt.GOODSTYPECODE, '001001' ) = 1 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 1 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '0'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -3501,24 +3459,18 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							grouping_id ( TO_CHAR( p.createtime, 'yyyyMM' ) ) AS gid,
 
 							TO_CHAR( p.createtime, 'yyyyMM' ) AS 时间,
 
 							count( DISTINCT p.barcode ) AS 数量 
-						FROM
 
-							(SELECT *
 
-							  FROM (SELECT PD.*,
 
-										   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-									  FROM TP_PM_PRODUCTIONDATA PD
 
-									 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-										ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-									 WHERE PD.VALUEFLAG = '1'
 
-									   AND PD.MODELTYPE IN (-1, -4, -5)
 
-									   AND PD.CREATETIME >= @DATEBEGIN@ 
-									   AND PD.CREATETIME < @DATEEND@ 
-									   AND INSTR( PD.GROUTINGLINECODE, 'A' ) = 1 
-									   AND PD.GOODSLEVELTYPEID = 7
 
-									   AND PD.ISREFIRE = 6) T
 
-							 WHERE T.RK <= 1) P
 
-							INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-							INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
-						WHERE INSTR( gt.GOODSTYPECODE, '001001' ) = 1 
+						FROM TP_PM_PRODUCTIONDATA P
 
+					   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+					   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+					   WHERE INSTR( gt.GOODSTYPECODE, '001001' ) = 1 
+						 AND P.VALUEFLAG = '1'
 
+					     AND P.MODELTYPE IN (-1, -4, -5)
 
+						 AND P.CHECKBATCHNO = 1
 
+						 AND P.CREATETIME >= @DATEBEGIN@ 
+						 AND P.CREATETIME < @DATEEND@ 
+						 AND INSTR(P.GROUTINGLINECODE, 'A') = 1
 
+						 AND P.GOODSLEVELTYPEID = 7
 
+						 AND P.ISREFIRE = '6'
 
 						GROUP BY
 
 							grouping sets ( TO_CHAR( p.createtime, 'yyyyMM' ), ( ) ) 
 						) 
@@ -4339,21 +4291,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 							p.GOODSCODE 产品编码,
 
 							p.GOODSNAME 产品名称,
 
 							p.CREATETIME 创建时间
 
-							FROM
 
-								(SELECT *
 
-								  FROM (SELECT PD.*,
 
-											   RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID, PD.ISREFIRE ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-										  FROM TP_PM_PRODUCTIONDATA PD
 
-										 INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-											ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-										 WHERE PD.VALUEFLAG = '1'
 
-										   AND PD.MODELTYPE IN (-1, -4, -5)
 
-										   AND PD.CREATETIME >= @DATEBEGIN@ 
-										   AND PD.CREATETIME < @DATEEND@ 
-										   AND PD.GOODSLEVELTYPEID = 7) T
 
-								 WHERE T.RK <= 1) P
 
-								INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
-								INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid ";
 
+							FROM TP_PM_PRODUCTIONDATA P
 
+						   INNER JOIN TP_MST_Goods g ON g.Goodsid = p.GoodsID
 
+						   INNER JOIN TP_MST_GOODSTYPE gt ON gt.GOODSTYPEID = g.Goodstypeid 
+						   WHERE P.VALUEFLAG = '1'
 
+							 AND P.MODELTYPE IN (-1, -4, -5)
 
+						 	 AND P.CHECKBATCHNO = 1
 
+							 AND P.CREATETIME >= @DATEBEGIN@ 
+							 AND P.CREATETIME < @DATEEND@ 
+							 AND P.GOODSLEVELTYPEID = 7 ";
 
                 if (context.Request["index"] + "" == "7" || context.Request["index"] + "" == "19" || context.Request["index"] + "" == "31" || context.Request["index"] + "" == "43" || context.Request["checkMaster"] + "" == "1"  )
 
                 {
 
                     //  本烧登记次品数

+ 14 - 32
wwwroot/mes/rpt2/rpt8001/rpt.ashx
Fájl Megtekintése 

@@ -400,25 +400,16 @@ WITH
 
 		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
 
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登记次品数_三部全部,
 
 		SUM( DECODE(P.ISREFIRE,6,1,0) ) AS 重烧登记次品数_合计
 
-	FROM
 
-		(SELECT *
 
-			FROM (SELECT PD.*,
 
-						RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-					FROM TP_PM_PRODUCTIONDATA PD
 
-					INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-					ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-					WHERE PD.VALUEFLAG = '1'
 
-					AND PD.MODELTYPE IN (-1, -4, -5)
 
-					AND PD.CREATETIME >= @DATEBEGIN@ 
-					AND PD.CREATETIME < @DATEEND@ 
-					AND PD.GOODSLEVELTYPEID = 7
 
-					AND PD.ISREFIRE = 0) T
 
-			WHERE T.RK <= 1) P
 
+	FROM TP_PM_PRODUCTIONDATA P
 
 		INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 
 		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 		INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
 
-	WHERE
 
-		P.CREATETIME >= @DATEBEGIN@
 
+	WHERE P.MODELTYPE IN (-1, -4, -5)
 
+        AND P.CHECKBATCHNO = 1
 
+        AND P.VALUEFLAG = '1'
 
+		--AND P.ISREFIRE = '0'
 
+		AND P.GOODSLEVELTYPEID = 7
 
+		AND P.CREATETIME >= @DATEBEGIN@
 
 		AND P.CREATETIME < @DATEEND@
 
 		-- AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
 
 		AND P.GOODSLEVELTYPEID = 7 --产品分级类别 (1无缺陷、2有缺陷、3废品、4正品、5副品、6重烧、7次品、9干补)
 
@@ -445,25 +436,16 @@ WITH
 
 		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
 
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登记次品数_三部全部,
 
 		SUM( DECODE(P.ISREFIRE,6,1,0) ) AS 重烧登记次品数_合计
 
-	FROM
 
-		(SELECT *
 
-			FROM (SELECT PD.*,
 
-						RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-					FROM TP_PM_PRODUCTIONDATA PD
 
-					INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-					ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-					WHERE PD.VALUEFLAG = '1'
 
-					AND PD.MODELTYPE IN (-1, -4, -5)
 
-					AND PD.CREATETIME >= @DATEBEGIN@ 
-					AND PD.CREATETIME < @DATEEND@ 
-					AND PD.GOODSLEVELTYPEID = 7
 
-					AND PD.ISREFIRE = 0) T
 
-			WHERE T.RK <= 1) P
 
+	FROM TP_PM_PRODUCTIONDATA P
 
 		INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 
 		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 		INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
 
-	WHERE
 
-		P.BACKOUTTIME >= @DATEBEGIN@
 
+	WHERE P.MODELTYPE IN (-1, -4, -5)
 
+        AND P.CHECKBATCHNO = 1
 
+        AND P.VALUEFLAG = '1'
 
+		--AND P.ISREFIRE = '0'
 
+		AND P.GOODSLEVELTYPEID = 7
 
+		AND P.BACKOUTTIME >= @DATEBEGIN@
 
 		AND P.BACKOUTTIME < @DATEEND@
 
 		-- AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
 
 		AND P.GOODSLEVELTYPEID = 7 --产品分级类别 (1无缺陷、2有缺陷、3废品、4正品、5副品、6重烧、7次品、9干补)

+ 26 - 40
wwwroot/mes/rpt2/rpt8006/rpt.ashx
Fájl Megtekintése 

@@ -178,26 +178,19 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 				                   T.KILNCODE,
 
                                    T.KILNCARBATCHNO,
 
                                    1 AS CC
 
-                              FROM (SELECT PD.GOODSLEVELTYPEID,
 
-                                           PD.BARCODE,
 
-                                           PD.GROUTINGLINECODE,
 
-                                           PD.GOODSID,
 
-                                           PD.KILNID,
 
-          				                   PD.KILNCODE,
 
-                                           PD.KILNCARBATCHNO,
 
-                                           RANK() OVER(PARTITION BY PD.BARCODE, pd.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-                                      FROM TP_PM_PRODUCTIONDATA PD
 
-                                     INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-                                        ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-                                     WHERE PD.VALUEFLAG = '1' 
-				                       AND PD.MODELTYPE IN (-1, -4, -5)
 
-				                       AND PD.ACCOUNTID = 1 
-				                       AND LENGTH( PD.KILNCARBATCHNO ) > 0 
-				                       AND PD.CREATETIME >= @DATEBEGIN@ 
-				                       AND PD.CREATETIME < @DATEEND@ -- 	AND INSTR( ',' || '660,666,669' || ',', ',' || PD.GROUTINGLINEID || ',' ) > 0 
-			                       --  AND PD.KILNCODE = 1	
-				                       AND (GDD.TESTMOULDFLAG = '{T}' OR '{T}' IS NULL)
 
-				                       AND PD.ISREFIRE = '0' ) T WHERE T.RK <= 1 
+                              FROM TP_PM_PRODUCTIONDATA T
 
+                             INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
+                                ON GDD.GROUTINGDAILYDETAILID = T.GROUTINGDAILYDETAILID
 
+                             WHERE T.VALUEFLAG = '1' 
+				               AND T.MODELTYPE IN (-1, -4, -5)
 
+                               AND T.CHECKBATCHNO = 1
 
+				               AND T.ACCOUNTID = 1 
+				               AND LENGTH( T.KILNCARBATCHNO ) > 0 
+				               AND T.CREATETIME >= @DATEBEGIN@ 
+				               AND T.CREATETIME < @DATEEND@ -- 	AND INSTR( ',' || '660,666,669' || ',', ',' || PD.GROUTINGLINEID || ',' ) > 0 
+			               --  AND T.KILNCODE = 1	
+				               AND (GDD.TESTMOULDFLAG = '{T}' OR '{T}' IS NULL)
 
+				               AND T.ISREFIRE = '0' 
                             UNION ALL
 
                             SELECT '重烧' AS FIRETYPE,
 
                                    T.GOODSLEVELTYPEID,
 
@@ -208,26 +201,19 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 				                   T.KILNCODE,
 
                                    T.KILNCARBATCHNO,
 
                                    1 AS CC
 
-                              FROM (SELECT PD.GOODSLEVELTYPEID,
 
-                                           PD.BARCODE,
 
-                                           PD.GROUTINGLINECODE,
 
-                                           PD.GOODSID,
 
-                                           PD.KILNID,
 
-          				                   PD.KILNCODE,
 
-                                           PD.KILNCARBATCHNO,
 
-                                           RANK() OVER(PARTITION BY PD.BARCODE, pd.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
 
-                                      FROM TP_PM_PRODUCTIONDATA PD
 
-                                     INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
-                                        ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
 
-                                     WHERE PD.VALUEFLAG = '1' 
-				                       AND PD.MODELTYPE IN (-1, -4, -5)
 
-				                       AND PD.ACCOUNTID = 1 
-				                       AND LENGTH( PD.KILNCARBATCHNO ) > 0 
-				                       AND PD.CREATETIME >= @DATEBEGIN@ 
-				                       AND PD.CREATETIME < @DATEEND@ -- 	AND INSTR( ',' || '660,666,669' || ',', ',' || PD.GROUTINGLINEID || ',' ) > 0 
-			                        -- AND PD.KILNCODE = 1
 
-				                       AND (GDD.TESTMOULDFLAG = '{T}' OR '{T}' IS NULL)
 
-				                       AND PD.ISREFIRE = '6' ) T WHERE T.RK <= 1 ) PPCC
 
+                              FROM TP_PM_PRODUCTIONDATA T
 
+                             INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
 
+                                ON GDD.GROUTINGDAILYDETAILID = T.GROUTINGDAILYDETAILID
 
+                             WHERE T.VALUEFLAG = '1' 
+				               AND T.MODELTYPE IN (-1, -4, -5)
 
+                               AND T.CHECKBATCHNO = 1
 
+				               AND T.ACCOUNTID = 1 
+				               AND LENGTH( T.KILNCARBATCHNO ) > 0 
+				               AND T.CREATETIME >= @DATEBEGIN@ 
+				               AND T.CREATETIME < @DATEEND@ -- 	AND INSTR( ',' || '660,666,669' || ',', ',' || PD.GROUTINGLINEID || ',' ) > 0 
+			               --  AND T.KILNCODE = 1	
+				               AND (GDD.TESTMOULDFLAG = '{T}' OR '{T}' IS NULL)
 
+				               AND T.ISREFIRE = '6' ) PPCC
 
                          INNER JOIN TP_MST_GOODS MSTGOODS
 
                             ON MSTGOODS.GOODSID = PPCC.GOODSID
 
                          INNER JOIN TP_MST_GOODSTYPE MSTGOODSTYPE