驾驶舱看板修改

wwwroot/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=169433
@@ -6,20 +6,20 @@
 <configuration>
   <connectionStrings>
     <!--三水测试服务器-->
-    <add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.112)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>
+    <add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.116)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client" />
     <!--东科服务器-->
     <!--<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=hegii.dongkesoft.cn)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=hegiimes)));User Id=hegiimes;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>-->
   </connectionStrings>
   <appSettings>
-    <add key="ProductCheckServer" value="http://172.18.32.32:5678"/>
+    <add key="ProductCheckServer" value="http://172.18.32.32:5678" />
 	  <!--乾润服务器-->
-	  <add key="QianRunServer" value="http://172.18.30.70:8080"/>
+	  <add key="QianRunServer" value="http://172.18.30.70:8080" />
   </appSettings>
   <system.web>
-    <customErrors mode="Off"/>
-    <compilation targetFramework="4.0" debug="true"/>
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" validateRequest="false"/>
-    <httpRuntime/>
+    <customErrors mode="Off" />
+    <compilation targetFramework="4.0" debug="true" />
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" validateRequest="false" />
+    <httpRuntime />
     <!--<sessionState mode="StateServer" stateConnectionString="tcpip=127.0.0.1:42424" cookieless="false" timeout="20"/>-->
   </system.web>
   <system.data>
@@ -29,14 +29,19 @@
     </DbProviderFactories>
     -->
     <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client"/>
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+      <remove invariant="Oracle.ManagedDataAccess.Client" />
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
     </DbProviderFactories>
   </system.data>
   <system.webServer>
     <staticContent>
-      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive"/>
+      <mimeMap fileExtension=".apk" mimeType="application/vnd.android.package-archive" />
       <!--<mimeMap fileExtension=".mp4" mimeType="application/mp4" />-->
     </staticContent>
+        <httpProtocol>
+            <customHeaders>
+                <add name="Access-Control-Allow-Origin" value="*" />
+            </customHeaders>
+        </httpProtocol>
   </system.webServer>
 </configuration>

wwwroot/main/manage/JiaShiCang/rpt.ashx

@@ -20,7 +20,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         using (IDataAccess conn = DataAccess.Create())
         {
             //成检大小件TOP3缺陷占比
-            if (context.Request["m"].ToString() == "Load03") {
+            if (context.Request["m"].ToString() == "Load03")
+            {
 
                 string sqlStr = @"
 													WITH 出窑数 AS (
@@ -146,7 +147,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													)
 													SELECT
 													一车间前三缺陷数量.workshops, 
-														DECODE( NVL( 一车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 一车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.ONEOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.ONEOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 一车间前三缺陷数量.缺陷名称
+														DECODE( NVL( 一车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 一车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.ONEOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.ONEOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 一车间前三缺陷数量.缺陷名称
 													FROM
 													一车间前三缺陷数量 
 													LEFT JOIN 出窑数 on 1=1
@@ -155,7 +156,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													
 													SELECT
 													二车间前三缺陷数量.workshops, 
-														DECODE( NVL( 二车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 二车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.TWOOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.TWOOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 二车间前三缺陷数量.缺陷名称
+														DECODE( NVL( 二车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 二车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.TWOOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.TWOOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 二车间前三缺陷数量.缺陷名称
 													FROM
 													二车间前三缺陷数量 
 													LEFT JOIN 出窑数 on 1=1
@@ -164,7 +165,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													
 													SELECT
 													三车间前三缺陷数量.workshops, 
-														DECODE( NVL( 三车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 三车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.THREEOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.THREEOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 三车间前三缺陷数量.缺陷名称
+														DECODE( NVL( 三车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 三车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 出窑数.THREEOUTKILNCOUNT, 1 ), 0, 1, NVL( 出窑数.THREEOUTKILNCOUNT, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 三车间前三缺陷数量.缺陷名称
 													FROM
 													三车间前三缺陷数量 
 													LEFT JOIN 出窑数 on 1=1";
@@ -173,7 +174,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-            if (context.Request["m"].ToString() == "Load02") {
+            if (context.Request["m"].ToString() == "Load02")
+            {
                 //直接获取不分页数据
                 string sqlStr = @"WITH 一车间前三缺陷数量 AS (
 																SELECT
@@ -299,7 +301,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																)
 																SELECT
 																一车间前三缺陷数量.workshops, 
-																	DECODE( NVL( 一车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 一车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 一车间产量.检验量, 1 ), 0, 1, NVL( 一车间产量.检验量, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 一车间前三缺陷数量.缺陷名称
+																	DECODE( NVL( 一车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 一车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 一车间产量.检验量, 1 ), 0, 1, NVL( 一车间产量.检验量, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 一车间前三缺陷数量.缺陷名称
 																FROM
 																一车间前三缺陷数量 
 																LEFT JOIN 一车间产量 on 1=1
@@ -308,7 +310,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																
 																SELECT
 																二车间前三缺陷数量.workshops, 
-																	DECODE( NVL( 二车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 二车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 二车间产量.检验量, 1 ), 0, 1, NVL( 二车间产量.检验量, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 二车间前三缺陷数量.缺陷名称
+																	DECODE( NVL( 二车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 二车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 二车间产量.检验量, 1 ), 0, 1, NVL( 二车间产量.检验量, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 二车间前三缺陷数量.缺陷名称
 																FROM
 																二车间前三缺陷数量 
 																LEFT JOIN 二车间产量 on 1=1
@@ -317,7 +319,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																
 																SELECT
 																三车间前三缺陷数量.workshops, 
-																	DECODE( NVL( 三车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 三车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 三车间产量.检验量, 1 ), 0, 1, NVL( 三车间产量.检验量, 1 ) ) ) * 100, 'fm99990.00' )  ) 缺陷占比, 三车间前三缺陷数量.缺陷名称
+																	DECODE( NVL( 三车间前三缺陷数量.缺陷数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 三车间前三缺陷数量.缺陷数量, 0 ) / DECODE( NVL( 三车间产量.检验量, 1 ), 0, 1, NVL( 三车间产量.检验量, 1 ) ) ) * 100, 'fm99990.0' )  ) 缺陷占比, 三车间前三缺陷数量.缺陷名称
 																FROM
 																三车间前三缺陷数量 
 																LEFT JOIN 三车间产量 on 1=1
@@ -332,8 +334,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												H.缺陷名称,
 												H.缺陷数,
 												H.缺陷占比,
-												H.上月比,
-												CASE WHEN H.上月比 > H.缺陷占比 THEN '下降↓'
+												H.上周比,
+												CASE WHEN H.上周比 > H.缺陷占比 THEN '下降↓'
 													   ELSE '上升↑'
 												END 对比趋势
 												FROM(
@@ -341,10 +343,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												TT.DEFECTNAME 缺陷名称,
 												TT2.COUNT 出窑数,
 												TT.COUNT 缺陷数,
-												TO_CHAR((TT.COUNT/TT2.COUNT)* 100,'9,990.00') || '%' AS 缺陷占比,
+												TO_CHAR((TT.COUNT/TT2.COUNT)* 100,'fm99990.0') || '%' AS 缺陷占比,
 												TT4.COUNT 上个月缺陷数量,
 												TT6.COUNT 上个月出窑数,
-												TO_CHAR((TT4.COUNT/TT6.COUNT)* 100,'9,990.00') || '%' AS 上月比
+												TO_CHAR((TT4.COUNT/TT6.COUNT)* 100,'fm99990.0') || '%' AS 上周比
 												FROM(
 												SELECT ROWNUM id,T.DEFECTID,T.DEFECTNAME,T.count FROM (
 												SELECT
@@ -357,14 +359,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
-												WHERE
-													TPPD.PROCEDUREID = 125 
+													WHERE
+													TPPD.PROCEDUREID IN (125,131)
 													AND TPPD.GOODSLEVELTYPEID = 7 
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ) 
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 												GROUP BY
 													TMD.S_NAME,TMD.DEFECTID
 												ORDER BY
@@ -382,12 +385,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+													WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 														SELECT
 													COUNT(1) count
@@ -395,12 +399,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+								WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -408,12 +413,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD 
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+											WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ))T2)TT2 ON TT.id = TT2.id
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+													)T2)TT2 ON TT.id = TT2.id
 													FULL JOIN(
 													SELECT ROWNUM id,T4.DEFECTNAME,T4.count FROM (
 												SELECT
@@ -425,15 +432,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
-													WHERE
-													TPPD.PROCEDUREID IN (125,105) 
+												WHERE
+													TPPD.PROCEDUREID IN (125,131) 
 													AND TPPD.GOODSLEVELTYPEID = 7 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >=  TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 												GROUP BY
 													TMD.S_NAME
 												ORDER BY
@@ -449,13 +456,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD 
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+															WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 						UNION ALL
 											SELECT
 													COUNT(1) count
@@ -463,13 +470,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD 
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+										WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -477,26 +484,25 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD 
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+													WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND GDTYPE.GOODSTYPECODE='001001001'
+													AND  GDTYPE.GOODSTYPECODE='001001001'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													)T6)TT6 ON TT.id = TT6.id 
 													
 													)H
 													 WHERE H.缺陷数 IS NOT NULL 
-													 
-													 UNION ALL 
-													 	SELECT		
+													 UNION ALL
+													  	SELECT		
 														'智能',
 												H.缺陷名称,
 												H.缺陷数,
 												H.缺陷占比,
-												H.上月比,
-												CASE WHEN H.上月比 > H.缺陷占比 THEN '下降↓'
+												H.上周比,
+												CASE WHEN H.上周比 > H.缺陷占比 THEN '下降↓'
 													   ELSE '上升↑'
 												END 对比趋势
 												FROM(
@@ -504,10 +510,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												TT.DEFECTNAME 缺陷名称,
 												TT2.COUNT 出窑数,
 												TT.COUNT 缺陷数,
-												TO_CHAR((TT.COUNT/TT2.COUNT)* 100,'9,990.00') || '%' AS 缺陷占比,
+												TO_CHAR((TT.COUNT/TT2.COUNT)* 100,'fm99990.0') || '%' AS 缺陷占比,
 												TT4.COUNT 上个月缺陷数量,
 												TT6.COUNT 上个月出窑数,
-												TO_CHAR((TT4.COUNT/TT6.COUNT)* 100,'9,990.00') || '%' AS 上月比
+												TO_CHAR((TT4.COUNT/TT6.COUNT)* 100,'fm99990.0') || '%' AS 上周比
 												FROM(
 												SELECT ROWNUM id,T.DEFECTID,T.DEFECTNAME,T.count FROM (
 												SELECT
@@ -520,14 +526,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
-												WHERE
-													TPPD.PROCEDUREID = 125 
+													WHERE
+													TPPD.PROCEDUREID IN (125,131)
 													AND TPPD.GOODSLEVELTYPEID = 7 
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ) 
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 												GROUP BY
 													TMD.S_NAME,TMD.DEFECTID
 												ORDER BY
@@ -545,12 +552,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+														WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 														SELECT
 													COUNT(1) count
@@ -558,12 +566,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+														WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -571,12 +580,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													TP_PM_PRODUCTIONDATA TPPD 
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
-												WHERE
-													TPPD.PROCEDUREID = 104 
+													WHERE
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ))T2)TT2 ON TT.id = TT2.id
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+													
+													)T2)TT2 ON TT.id = TT2.id
 													FULL JOIN(
 													SELECT ROWNUM id,T4.DEFECTNAME,T4.count FROM (
 												SELECT
@@ -588,15 +600,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
-													WHERE
-													TPPD.PROCEDUREID IN (125,105) 
+								WHERE
+													TPPD.PROCEDUREID IN (125,131) 
 													AND TPPD.GOODSLEVELTYPEID = 7 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >=  TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 												GROUP BY
 													TMD.S_NAME
 												ORDER BY
@@ -613,12 +625,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 						UNION ALL
 											SELECT
 													COUNT(1) count
@@ -627,12 +639,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
 													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -641,26 +653,26 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND GDTYPE.GOODSTYPECODE='001001003'
+													AND  GDTYPE.GOODSTYPECODE='001001003'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													)T6)TT6 ON TT.id = TT6.id 
 													
 													)H
 													 WHERE H.缺陷数 IS NOT NULL 
 													 
-													 UNION ALL 
-													 
-													 	SELECT	
+													 UNION ALL 	
+	
+	SELECT	
 														'小件',
 												H.缺陷名称,
 												H.缺陷数,
 												H.缺陷占比,
-												H.上月比,
-												CASE WHEN H.上月比 > H.缺陷占比 THEN '下降↓'
+												H.上周比,
+												CASE WHEN H.上周比 > H.缺陷占比 THEN '下降↓'
 													   ELSE '上升↑'
 												END 对比趋势
 												FROM(
@@ -668,10 +680,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												TT.DEFECTNAME 缺陷名称,
 												TT2.COUNT 出窑数,
 												TT.COUNT 缺陷数,
-												TO_CHAR((TT.COUNT/TT2.COUNT)* 100,'9,990.00') || '%' AS 缺陷占比,
+												TO_CHAR((NVL(TT.COUNT,0)/TT2.COUNT)* 100,'fm99990.0') || '%' AS 缺陷占比,
 												TT4.COUNT 上个月缺陷数量,
 												TT6.COUNT 上个月出窑数,
-												TO_CHAR((TT4.COUNT/TT6.COUNT)* 100,'9,990.00') || '%' AS 上月比
+												TO_CHAR((NVL(TT4.COUNT, 0)/TT6.COUNT)* 100,'fm99990.0') || '%' AS 上周比
 												FROM(
 												SELECT ROWNUM id,T.DEFECTID,T.DEFECTNAME,T.count FROM (
 												SELECT
@@ -685,13 +697,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
 												WHERE
-													TPPD.PROCEDUREID = 125 
+													TPPD.PROCEDUREID IN (125,131)
 													AND TPPD.GOODSLEVELTYPEID = 7 
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ) 
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 												GROUP BY
 													TMD.S_NAME,TMD.DEFECTID
 												ORDER BY
@@ -710,11 +723,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 														SELECT
 													COUNT(1) count
@@ -723,11 +737,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' )
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -736,11 +751,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= TO_DATE( TO_CHAR( SYSDATE, 'YYYY-MM' ), 'YYYY-MM' ))T2)TT2 ON TT.id = TT2.id
+													AND TPPD.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND TPPD.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+													)T2)TT2 ON TT.id = TT2.id
 													FULL JOIN(
 													SELECT ROWNUM id,T4.DEFECTNAME,T4.count FROM (
 												SELECT
@@ -753,14 +770,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID
 													WHERE
-													TPPD.PROCEDUREID IN (125,105) 
+													TPPD.PROCEDUREID IN (125,131) 
 													AND TPPD.GOODSLEVELTYPEID = 7 
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPD.VALUEFLAG = 1
 													AND TPPD.VALUEFLAG = 1
 													AND TMD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >=  TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 												GROUP BY
 													TMD.S_NAME
 												ORDER BY
@@ -777,12 +794,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 						UNION ALL
 											SELECT
 													COUNT(1) count
@@ -791,12 +808,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND  SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													UNION ALL
 													SELECT
 													COUNT(1)
@@ -805,12 +822,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODS GD ON GD.GOODSID=TPPD.GOODSID
 													LEFT JOIN TP_MST_GOODSTYPE GDTYPE ON GD.GOODSTYPEID=GDTYPE.GOODSTYPEID 
 												WHERE
-													TPPD.PROCEDUREID = 104 
+													TPPD.PROCEDUREID IN (104,11)
 													AND TPPD.ISREFIRE = 0 
-													AND SUBSTR(  GDTYPE.GOODSTYPEFULLNAME,0,6)='001002'
+													AND  SUBSTR(  GDTYPE.GOODSTYPECODE,0,6)='001002'
 													AND TPPD.VALUEFLAG = 1
-													AND TPPD.CREATETIME >= trunc(add_months(SYSDATE,-1),'mm')
-													AND TPPD.CREATETIME <= last_day(add_months(SYSDATE,-1))
+													AND TPPD.CREATETIME >= TRUNC(NEXT_DAY(SYSDATE-8,1)-6)
+													AND TPPD.CREATETIME  < TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
 													)T6)TT6 ON TT.id = TT6.id 
 													
 													)H
@@ -957,17 +974,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 														本烧出窑总数
 													UNION ALL
 													SELECT 
-														ROUND( ( (本烧出窑总数.ONESUBSTANDARDCOUNT - 本烧次品重烧数.ONESUBSTANDARDCOUNT - 本烧次品重烧数.ONEREFIRECOUNT ) / 本烧出窑总数.ONESUBSTANDARDCOUNT )*100 ,2 ) AS 一车间,
-														ROUND( ( (本烧出窑总数.TWOSUBSTANDARDCOUNT - 本烧次品重烧数.TWOSUBSTANDARDCOUNT - 本烧次品重烧数.TWOREFIRECOUNT) / 本烧出窑总数.TWOSUBSTANDARDCOUNT )*100 ,2 ) AS 二车间,
-														ROUND( ( (本烧出窑总数.THREESUBSTANDARDCOUNT - 本烧次品重烧数.THREESUBSTANDARDCOUNT - 本烧次品重烧数.THREEREFIRECOUNT) / 本烧出窑总数.THREESUBSTANDARDCOUNT )*100 ,2 ) AS 三车间
+														ROUND( ( (本烧出窑总数.ONESUBSTANDARDCOUNT - 本烧次品重烧数.ONESUBSTANDARDCOUNT - 本烧次品重烧数.ONEREFIRECOUNT ) / 本烧出窑总数.ONESUBSTANDARDCOUNT )*100 ,1 ) AS 一车间,
+														ROUND( ( (本烧出窑总数.TWOSUBSTANDARDCOUNT - 本烧次品重烧数.TWOSUBSTANDARDCOUNT - 本烧次品重烧数.TWOREFIRECOUNT) / 本烧出窑总数.TWOSUBSTANDARDCOUNT )*100 ,1 ) AS 二车间,
+														ROUND( ( (本烧出窑总数.THREESUBSTANDARDCOUNT - 本烧次品重烧数.THREESUBSTANDARDCOUNT - 本烧次品重烧数.THREEREFIRECOUNT) / 本烧出窑总数.THREESUBSTANDARDCOUNT )*100 ,1 ) AS 三车间
 													FROM 
 													本烧出窑总数
 													LEFT JOIN 本烧次品重烧数 ON 1 = 1
 													UNION ALL
 													SELECT
-														ROUND((((本烧出窑总数.ONESUBSTANDARDCOUNT-本烧次品重烧数.ONESUBSTANDARDCOUNT-本烧次品重烧数.ONEREFIRECOUNT)+(重烧出窑总数.ONESUBSTANDARDCOUNT-重烧次品重烧数.ONESUBSTANDARDCOUNT-重烧次品重烧数.ONEREFIRECOUNT))/本烧出窑总数.ONESUBSTANDARDCOUNT)*100 ,2 ) AS 一车间,
-														ROUND((((本烧出窑总数.TWOSUBSTANDARDCOUNT-本烧次品重烧数.TWOSUBSTANDARDCOUNT-本烧次品重烧数.TWOREFIRECOUNT)+(重烧出窑总数.TWOSUBSTANDARDCOUNT-重烧次品重烧数.TWOSUBSTANDARDCOUNT-重烧次品重烧数.TWOREFIRECOUNT))/本烧出窑总数.TWOSUBSTANDARDCOUNT)*100 ,2 ) AS 二车间,
-														ROUND((((本烧出窑总数.THREESUBSTANDARDCOUNT-本烧次品重烧数.THREESUBSTANDARDCOUNT-本烧次品重烧数.THREEREFIRECOUNT)+(重烧出窑总数.THREESUBSTANDARDCOUNT-重烧次品重烧数.THREESUBSTANDARDCOUNT-重烧次品重烧数.THREEREFIRECOUNT))/本烧出窑总数.THREESUBSTANDARDCOUNT)*100 ,2 ) AS 三车间
+														ROUND((((本烧出窑总数.ONESUBSTANDARDCOUNT-本烧次品重烧数.ONESUBSTANDARDCOUNT-本烧次品重烧数.ONEREFIRECOUNT)+(重烧出窑总数.ONESUBSTANDARDCOUNT-重烧次品重烧数.ONESUBSTANDARDCOUNT-重烧次品重烧数.ONEREFIRECOUNT))/本烧出窑总数.ONESUBSTANDARDCOUNT)*100 ,1 ) AS 一车间,
+														ROUND((((本烧出窑总数.TWOSUBSTANDARDCOUNT-本烧次品重烧数.TWOSUBSTANDARDCOUNT-本烧次品重烧数.TWOREFIRECOUNT)+(重烧出窑总数.TWOSUBSTANDARDCOUNT-重烧次品重烧数.TWOSUBSTANDARDCOUNT-重烧次品重烧数.TWOREFIRECOUNT))/本烧出窑总数.TWOSUBSTANDARDCOUNT)*100 ,1 ) AS 二车间,
+														ROUND((((本烧出窑总数.THREESUBSTANDARDCOUNT-本烧次品重烧数.THREESUBSTANDARDCOUNT-本烧次品重烧数.THREEREFIRECOUNT)+(重烧出窑总数.THREESUBSTANDARDCOUNT-重烧次品重烧数.THREESUBSTANDARDCOUNT-重烧次品重烧数.THREEREFIRECOUNT))/本烧出窑总数.THREESUBSTANDARDCOUNT)*100 ,1 ) AS 三车间
 													FROM 
 													本烧出窑总数
 													LEFT JOIN 本烧次品重烧数 ON 1 = 1
@@ -977,7 +994,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-			    if (context.Request["m"].ToString() == "Load07")
+            if (context.Request["m"].ToString() == "Load07")
             {
                 string sqlStr = @"SELECT
 											--成型小件
@@ -1055,131 +1072,167 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-		if (context.Request["m"].ToString() == "Load06")
+            if (context.Request["m"].ToString() == "Load06")
             {
-                string sqlStr = @"WITH 一车间半检产量 AS (
-																SELECT
-																	COUNT( DISTINCT PD.BARCODE ) AS ONEHALFCHECK
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-																	LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
-																	LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
-																WHERE
-																	PD.VALUEFLAG = 1 
-																	AND PD.PROCEDUREID IN ( 1, 17 ) 
-																	AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																	AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-																	AND INSTR( GTP.GOODSTYPECODE, '001002' ) = 1 
-																),
-															二车间半检产量 AS (
-																SELECT
-																	COUNT( DISTINCT PD.BARCODE ) AS TWOHALFCHECK 
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-																	LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
-																	LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
-																WHERE
-																	PD.VALUEFLAG = 1 
-																	AND PD.PROCEDUREID IN ( 1, 17 ) 
-																	AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																	AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-																	AND INSTR( GTP.GOODSTYPECODE, '001001' ) = 1 
-																),
-															三车间半检产量 AS (
-																SELECT
-																	COUNT( DISTINCT PD.BARCODE ) AS THREEHALFCHECK 
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-																	LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
-																	LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
-																WHERE
-																	PD.VALUEFLAG = 1 
-																	AND PD.PROCEDUREID IN ( 118, 92, 88 ) 
-																	AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																	AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-																),
-															车间干补数 AS (
-																SELECT
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS ONESPECIALREPAIR,
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS TWOSPECIALREPAIR,
-																	SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) AS THREESPECIALREPAIR
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-															 	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON PD.BARCODE = GDD.BARCODE
-																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = GDD.GOODSID
-																LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = GOODS.GOODSTYPEID 
-																WHERE
-																	PD.PROCEDUREID = 18
-																AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-															),
-															本烧出窑总数 AS (
-																SELECT
-																	--本烧一车间数
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) ONESUBSTANDARDCOUNT,
-																	--本烧二车间数
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) TWOSUBSTANDARDCOUNT,
-																	--本烧三车间数
-																	SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) THREESUBSTANDARDCOUNT
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-																	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.BARCODE = PD.BARCODE
-																	INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
-																	INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
-																WHERE
-																	PD.ACCOUNTID = 1 
-																	AND (
-																		( 11 = 11 AND ( ( PD.PROCEDUREID = 11 AND PD.VALUEFLAG = '1' AND PD.ISREFIRE = '0' ) OR ( PD.PROCEDUREID = 104 AND PD.ISREFIRE = '0' AND PD.CHECKFLAG = '1' ) ) ) 
-																		OR 
-																		( 11 = 58 AND ( ( PD.PROCEDUREID = 58 AND PD.VALUEFLAG = '1' ) OR ( PD.PROCEDUREID = 104 AND PD.ISREFIRE = '6' AND PD.CHECKFLAG = '1' ) ) ) 
-																		OR 
-																		( 11 NOT IN ( 11, 58 ) AND PD.VALUEFLAG = '1' AND PD.PROCEDUREID = 11 ) 
-																	) 
-																	AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																	AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-																),
-															车间冷补数 AS (
-																SELECT
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS ONELENGBU,
-																	SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS TWOLENGBU,
-																	SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) AS THREELENGBU
-																FROM
-																	TP_PM_PRODUCTIONDATA PD
-															 	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON PD.BARCODE = GDD.BARCODE
-															 	LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = GDD.GOODSID
-															 	LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = GOODS.GOODSTYPEID 
-															 	WHERE
-																	PD.PROCEDUREID IN (113,135)
-																AND PD.CREATETIME >= TRUNC( sysdate-7 )
-																AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
-																)
-															SELECT
-																ROUND(车间干补数.ONESPECIALREPAIR / 一车间半检产量.ONEHALFCHECK, 4) * 100 AS ONESPECIALREPAIR,
-																ROUND(车间干补数.TWOSPECIALREPAIR /二车间半检产量.TWOHALFCHECK, 4) * 100 AS TWOSPECIALREPAIR,
-																ROUND(车间干补数.THREESPECIALREPAIR / 三车间半检产量.THREEHALFCHECK, 4) * 100 AS THREESPECIALREPAIR,
-																ROUND(车间冷补数.ONELENGBU / 本烧出窑总数.ONESUBSTANDARDCOUNT, 4) * 100 AS ONELENGBU,
-																ROUND(车间冷补数.TWOLENGBU / 本烧出窑总数.TWOSUBSTANDARDCOUNT, 4) * 100 AS TWOLENGBU,
-																ROUND(车间冷补数.THREELENGBU / 本烧出窑总数.THREESUBSTANDARDCOUNT, 4) * 100 AS THREELENGBU
-															FROM
-															车间干补数
-															INNER JOIN 车间冷补数 ON 1 = 1
-															LEFT JOIN 一车间半检产量 ON 1 = 1
-															LEFT JOIN 二车间半检产量 ON 1 = 1
-															LEFT JOIN 三车间半检产量 ON 1 = 1
-															LEFT JOIN 本烧出窑总数 ON 1 = 1
-										
-										
-										";
+                //      string sqlStr = @"WITH 一车间半检产量 AS (
+                //						SELECT
+                //							COUNT( DISTINCT PD.BARCODE ) AS ONEHALFCHECK
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //							LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
+                //							LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
+                //						WHERE
+                //							PD.VALUEFLAG = 1 
+                //							AND PD.PROCEDUREID IN ( 1, 17 ) 
+                //							AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //							AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //							AND INSTR( GTP.GOODSTYPECODE, '001002' ) = 1 
+                //						),
+                //					二车间半检产量 AS (
+                //						SELECT
+                //							COUNT( DISTINCT PD.BARCODE ) AS TWOHALFCHECK 
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //							LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
+                //							LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
+                //						WHERE
+                //							PD.VALUEFLAG = 1 
+                //							AND PD.PROCEDUREID IN ( 1, 17 ) 
+                //							AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //							AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //							AND INSTR( GTP.GOODSTYPECODE, '001001' ) = 1 
+                //						),
+                //					三车间半检产量 AS (
+                //						SELECT
+                //							COUNT( DISTINCT PD.BARCODE ) AS THREEHALFCHECK 
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //							LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = PD.GOODSID
+                //							LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID = GOODS.GOODSTYPEID 
+                //						WHERE
+                //							PD.VALUEFLAG = 1 
+                //							AND PD.PROCEDUREID IN ( 118, 92, 88 ) 
+                //							AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //							AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //						),
+                //					车间干补数 AS (
+                //						SELECT
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS ONESPECIALREPAIR,
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS TWOSPECIALREPAIR,
+                //							SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) AS THREESPECIALREPAIR
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //					 	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON PD.BARCODE = GDD.BARCODE
+                //						LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = GDD.GOODSID
+                //						LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = GOODS.GOODSTYPEID 
+                //						WHERE
+                //							PD.PROCEDUREID = 18
+                //						AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //						AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //					),
+                //					本烧出窑总数 AS (
+                //						SELECT
+                //							--本烧一车间数
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) ONESUBSTANDARDCOUNT,
+                //							--本烧二车间数
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) TWOSUBSTANDARDCOUNT,
+                //							--本烧三车间数
+                //							SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) THREESUBSTANDARDCOUNT
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //							LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.BARCODE = PD.BARCODE
+                //							INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
+                //							INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
+                //						WHERE
+                //							PD.ACCOUNTID = 1 
+                //							AND (
+                //								( 11 = 11 AND ( ( PD.PROCEDUREID = 11 AND PD.VALUEFLAG = '1' AND PD.ISREFIRE = '0' ) OR ( PD.PROCEDUREID = 104 AND PD.ISREFIRE = '0' AND PD.CHECKFLAG = '1' ) ) ) 
+                //								OR 
+                //								( 11 = 58 AND ( ( PD.PROCEDUREID = 58 AND PD.VALUEFLAG = '1' ) OR ( PD.PROCEDUREID = 104 AND PD.ISREFIRE = '6' AND PD.CHECKFLAG = '1' ) ) ) 
+                //								OR 
+                //								( 11 NOT IN ( 11, 58 ) AND PD.VALUEFLAG = '1' AND PD.PROCEDUREID = 11 ) 
+                //							) 
+                //							AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //							AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //						),
+                //					车间冷补数 AS (
+                //						SELECT
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS ONELENGBU,
+                //							SUM( CASE WHEN ( ( INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 ) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS TWOLENGBU,
+                //							SUM( CASE WHEN INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 THEN 1 ELSE 0 END ) AS THREELENGBU
+                //						FROM
+                //							TP_PM_PRODUCTIONDATA PD
+                //					 	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON PD.BARCODE = GDD.BARCODE
+                //					 	LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID = GDD.GOODSID
+                //					 	LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = GOODS.GOODSTYPEID 
+                //					 	WHERE
+                //							PD.PROCEDUREID IN (113,135)
+                //						AND PD.CREATETIME >= TRUNC( sysdate-7 )
+                //						AND TRUNC( PD.CREATETIME ) <= TRUNC( SYSDATE )
+                //						)
+                //					SELECT
+                //																						TO_CHAR(ROUND(车间干补数.ONESPECIALREPAIR / 一车间半检产量.ONEHALFCHECK, 6) * 100,'fm99990.0') AS ONESPECIALREPAIR,
+                //						TO_CHAR(ROUND(车间干补数.TWOSPECIALREPAIR /二车间半检产量.TWOHALFCHECK, 6) * 100,'fm99990.0') AS TWOSPECIALREPAIR,
+                //						TO_CHAR(ROUND(车间干补数.THREESPECIALREPAIR / 三车间半检产量.THREEHALFCHECK, 6) * 100,'fm99990.0') AS THREESPECIALREPAIR,
+                //						TO_CHAR(ROUND(车间冷补数.ONELENGBU / 本烧出窑总数.ONESUBSTANDARDCOUNT, 6) * 100,'fm99990.0') AS ONELENGBU,
+                //						TO_CHAR(ROUND(车间冷补数.TWOLENGBU / 本烧出窑总数.TWOSUBSTANDARDCOUNT, 6) * 100,'fm99990.0') AS TWOLENGBU,
+                //						TO_CHAR(ROUND(车间冷补数.THREELENGBU / 本烧出窑总数.THREESUBSTANDARDCOUNT, 6) * 100,'fm99990.0') AS THREELENGBU
+                //					FROM
+                //					车间干补数
+                //					INNER JOIN 车间冷补数 ON 1 = 1
+                //					LEFT JOIN 一车间半检产量 ON 1 = 1
+                //					LEFT JOIN 二车间半检产量 ON 1 = 1
+                //					LEFT JOIN 三车间半检产量 ON 1 = 1
+                //					LEFT JOIN 本烧出窑总数 ON 1 = 1
+
+
+                //";
+                string sqlStr = @"with 成检检验数 AS (
+SELECT
+pd.GOODSCODE,
+COUNT( DISTINCT pd.BARCODE) AS 数量 FROM TP_PM_PRODUCTIONDATA pd
+INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE=pd.BARCODE AND gdd.TESTMOULDFLAG=0
+WHERE pd.PROCEDUREID IN( 125,131)
+AND pd.VALUEFLAG=1
+AND pd.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+AND pd.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+GROUP BY pd.GOODSCODE
+),成检废品数 AS (
+SELECT
+pd.GOODSCODE,
+COUNT( DISTINCT pd.BARCODE) AS 数量  FROM TP_PM_PRODUCTIONDATA pd
+INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE=pd.BARCODE AND gdd.TESTMOULDFLAG=0
+WHERE pd.PROCEDUREID IN( 125,131)
+AND pd.VALUEFLAG=1
+AND pd.GOODSLEVELTYPEID in(7,13)
+AND pd.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+AND pd.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+GROUP BY pd.GOODSCODE
+)
+
+SELECT
+*
+FROM(
+SELECT
+'成检' 工序,
+TO_CHAR(成检检验数.GOODSCODE) AS GOODSCODE,
+成检检验数.数量 AS 检验数,
+DECODE(NVL(成检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(成检废品数.数量, 0)) /DECODE(NVL(成检检验数.数量, 1),0,1,NVL(成检检验数.数量, 1))) * 100,'fm99990.0')) AS 废品率
+FROM 成检检验数
+LEFT JOIN 成检废品数 ON 成检废品数.GOODSCODE=成检检验数.GOODSCODE
+ORDER BY DECODE(NVL(成检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(成检废品数.数量, 0)) /DECODE(NVL(成检检验数.数量, 1),0,1,NVL(成检检验数.数量, 1))) * 100,'fm99990.0')) DESC
+) WHERE ROWNUM<6";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-		if (context.Request["m"].ToString() == "Load09")
+            if (context.Request["m"].ToString() == "Load09")
             {
                 string sqlStr = @"SELECT 
 												SUBSTR(TT.DICTIONARYVALUE, 0, 4) AS DICTIONARYVALUE,
-												DECODE(NVL(TT.INSPECTIONQUANTITY, 0),0,'0%',TO_CHAR(((NVL(TT.INSPECTIONQUANTITY, 0)) /DECODE(NVL(TT.PLANINSPECTIONQUANTITY, 1),0,1,NVL(TT.PLANINSPECTIONQUANTITY, 1))) * 100,'FM99990.00')) AS WANCHENGLV,
-												100 - DECODE(NVL(TT.BUHEGESHU, 0) ,0 ,'0%' ,TO_CHAR(((NVL(TT.BUHEGESHU, 0)) / DECODE(NVL(TT.INSPECTIONQUANTITY, 1), 0, 1, NVL(TT.INSPECTIONQUANTITY, 1))) * 100,'FM99990.00')) AS HEGELV
+												TT.INSPECTIONQUANTITY,
+												DECODE(NVL(TT.INSPECTIONQUANTITY, 0),0,0,TO_CHAR(((NVL(TT.INSPECTIONQUANTITY, 0)) /DECODE(NVL(TT.PLANINSPECTIONQUANTITY, 1),0,1,NVL(TT.PLANINSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS WANCHENGLV,
+												100 - DECODE(NVL(TT.BUHEGESHU, 0) ,0 ,0,TO_CHAR(((NVL(TT.BUHEGESHU, 0)) / DECODE(NVL(TT.INSPECTIONQUANTITY, 1), 0, 1, NVL(TT.INSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS HEGELV
 											FROM (
 												SELECT 
 													T.INSPECTTYPE,
@@ -1232,229 +1285,280 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-		if (context.Request["m"].ToString() == "Load04")
+            if (context.Request["m"].ToString() == "Load04")
             {
                 string sqlStr = @"SELECT
-														*
-														FROM(
-														SELECT
-															GD.MATERIALCODE,
-															COUNT(DISTINCT FD.BARCODE) FINNUM
-														FROM (
-															SELECT
-																DISTINCT GOODSID, MATERIALCODE, CREATETIME
-															FROM
-															( SELECT GOODSID, MATERIALCODE, CREATETIME FROM TP_MST_GOODS 
-																UNION ALL 
-																SELECT GOODSID, MATERIALCODE, CREATETIME FROM TP_MST_GOODSLOGOSAP
-															)
-														) GD
-														INNER JOIN TP_PM_FINISHEDPRODUCT FD ON FD.GOODSID = GD.GOODSID
-														WHERE
-															FD.VALUEFLAG = 1 
+												*
+												FROM
+												(
+												SELECT
+												goodssap.GOODSCODE,
+												COUNT(DISTINCT FD.BARCODE) AS COUNTS,
+												goodssap.CREATETIME
+												FROM
+												TP_PM_FINISHEDPRODUCT FD
+												LEFT JOIN TP_MST_GOODSLOGOSAP goodssap ON goodssap.GOODSCODE=FD.GOODSCODE
+												WHERE FD.VALUEFLAG = 1  
 															AND FD.CREATETIME >= TRUNC( SYSDATE - 7 ) 
 															AND TRUNC( FD.CREATETIME ) <= TRUNC( SYSDATE )
-														GROUP BY
-															GD.MATERIALCODE,
-															GD.CREATETIME		
-														ORDER BY
-															COUNT(DISTINCT FD.BARCODE) DESC
+															AND goodssap.GOODSCODE is NOT NULL
+															GROUP BY goodssap.GOODSCODE,goodssap.CREATETIME
+															ORDER BY goodssap.CREATETIME desc
 															)
-														
-															where ROWNUM<=6 ";
+															WHERE ROWNUM<6";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-			if (context.Request["m"].ToString() == "Load10")
-            {   List<CDAParameter> sqlPara = new List<CDAParameter>();
-            sqlPara.Add(new CDAParameter("DATEBEGIN", DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")+ " 00:00:00", DataType.DateTime));
-            sqlPara.Add(new CDAParameter("DATEEND", DateTime.Now.AddDays(0).ToString("yyyy-MM-dd")+ " 23:59:59", DataType.DateTime));
-			
-                string sqlStr = @"SELECT
-													* 
-												FROM
-													(
-													SELECT
-														TO_CHAR( '模具' || GOODSCODE ) AS 地点,
-														GOODSCODE,
-														时间差值,
-														to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
-													FROM
-														(
-														SELECT
-															mch.GOODSCODE,
-															SUM( mch.时间差 ) AS 时间差值,
-															COUNT( DISTINCT goodsmould.MOULDCODE ) AS 产量 
-														FROM
-															(
-															SELECT
-																mch.MOULDCODE,
-																mch.GOODSCODE,
-																TO_CHAR( ( ceil( ( ( mch.CREATETIME - mchh.CREATETIME ) ) * 24 ) ), 'fm9999990' ) AS 时间差 
-															FROM
-																tp_pc_mouldchangehistory mch
-																LEFT JOIN tp_pc_mouldchangehistory mchh ON mchh.MOULDCODE = mch.MOULDCODE 
-																AND mchh.operationtype = 1 
-															WHERE
-																mch.accountid = 1 
-																AND mch.operationtype = 6 --operationtype=1 新增入库    operationtype=6 库存上线（出库） -1为变更型号
-																
-																AND mch.operationtype >- 1 
-																AND mch.createtime >= @DATEBEGIN@
-																AND mch.createtime <= @DATEEND@
-															) mch
-															LEFT JOIN tp_pc_mouldchangehistory goodsmould ON goodsmould.MOULDCODE = mch.MOULDCODE 
-														WHERE
-															goodsmould.accountid = 1 
-															AND goodsmould.operationtype = 6 
-															AND goodsmould.operationtype >- 1 
-															AND goodsmould.createtime >= @DATEBEGIN@
-															AND goodsmould.createtime <= @DATEEND@
-														GROUP BY
-															mch.GOODSCODE 
-														ORDER BY
-															SUM( mch.时间差 ) DESC 
-														) 
-													ORDER BY
-														TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
-													) 
-												WHERE
-													ROWNUM <= 4 UNION ALL
-												SELECT
-													* 
-												FROM
-													(
-													SELECT
-														TO_CHAR( '精坯' || GOODSCODE ) AS 地点,
-														GOODSCODE,
-														时间差值,
-														to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
-													FROM
-														(
-														SELECT
-															inoutPD.GOODSCODE,
-															SUM( 时间差 ) AS 时间差值,
-															COUNT( DISTINCT GOODSPD.BARCODE ) 产量 
-														FROM
-															(
-															SELECT
-																OUTPD.BARCODE,
-																OUTPD.GOODSCODE,
-																TO_CHAR( ( ceil( ( ( OUTPD.CREATETIME - INPD.CREATETIME ) * 24 ) ) ), 'fm9999990' ) AS 时间差 
-															FROM
-																TP_PM_PRODUCTIONDATA OUTPD
-																INNER JOIN TP_PM_PRODUCTIONDATA INPD ON OUTPD.BARCODE = INPD.BARCODE 
-																AND INPD.PROCEDUREID IN ( 53, 97 ) 
-																AND INPD.VALUEFLAG = 1 
-															WHERE
-																OUTPD.PROCEDUREID IN ( 119, 64, 81 ) 
-																AND OUTPD.VALUEFLAG = 1 
-																AND OUTPD.createtime >= @DATEBEGIN@
-																AND OUTPD.createtime <= @DATEEND@
-															) inoutPD
-															INNER JOIN TP_PM_PRODUCTIONDATA GOODSPD ON GOODSPD.BARCODE = inoutPD.BARCODE 
-														WHERE
-															GOODSPD.PROCEDUREID IN ( 119, 64, 81 ) 
-															AND GOODSPD.VALUEFLAG = 1 
-															AND GOODSPD.createtime >= @DATEBEGIN@
-															AND GOODSPD.createtime <= @DATEEND@
-														GROUP BY
-															inoutPD.GOODSCODE 
-														) 
-													ORDER BY
-														TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
-													) 
-												WHERE
-													ROWNUM <= 3 UNION ALL
-												SELECT
-													* 
-												FROM
-													(
-													SELECT
-														TO_CHAR( '施釉' || GOODSCODE ) AS 地点,
-														GOODSCODE,
-														时间差值,
-														to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
-													FROM
-														(
-														SELECT
-															inoutPD.GOODSCODE,
-															SUM( 时间差 ) AS 时间差值,
-															COUNT( DISTINCT GOODSPD.BARCODE ) 产量 
-														FROM
-															(
-															SELECT
-																OUTPD.BARCODE,
-																OUTPD.GOODSCODE,
-																TO_CHAR( ( ceil( ( ( OUTPD.CREATETIME - INPD.CREATETIME ) * 24 ) ) ), 'fm9999990' ) AS 时间差 
-															FROM
-																TP_PM_PRODUCTIONDATA OUTPD
-																INNER JOIN TP_PM_PRODUCTIONDATA INPD ON OUTPD.BARCODE = INPD.BARCODE 
-																AND INPD.PROCEDUREID IN ( 99, 65 ) 
-																AND INPD.VALUEFLAG = 1 
-															WHERE
-																OUTPD.PROCEDUREID IN ( 5, 101 ) 
-																AND OUTPD.VALUEFLAG = 1 
-																AND OUTPD.createtime >= @DATEBEGIN@
-																AND OUTPD.createtime <= @DATEEND@
-															) inoutPD
-															INNER JOIN TP_PM_PRODUCTIONDATA GOODSPD ON GOODSPD.BARCODE = inoutPD.BARCODE 
-														WHERE
-															GOODSPD.PROCEDUREID IN ( 5, 101 ) 
-															AND GOODSPD.VALUEFLAG = 1 
-															AND GOODSPD.createtime >= @DATEBEGIN@
-															AND GOODSPD.createtime <= @DATEEND@
-														GROUP BY
-															inoutPD.GOODSCODE 
-														) 
-													ORDER BY
-														TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
-													) 
-												WHERE
-													ROWNUM <=3";
-                DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+            #region 模具库存周转率,产品 SKU 周转率
+            //if (context.Request["m"].ToString() == "Load10") 请勿删除 根据要求后期可能会再次使用
+            //         {   List<CDAParameter> sqlPara = new List<CDAParameter>();
+            //         sqlPara.Add(new CDAParameter("DATEBEGIN", DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")+ " 00:00:00", DataType.DateTime));
+            //         sqlPara.Add(new CDAParameter("DATEEND", DateTime.Now.AddDays(0).ToString("yyyy-MM-dd")+ " 23:59:59", DataType.DateTime));
+
+            //             string sqlStr = @"SELECT
+            //										* 
+            //									FROM
+            //										(
+            //										SELECT
+            //											TO_CHAR( '模具' || GOODSCODE ) AS 地点,
+            //											GOODSCODE,
+            //											时间差值,
+            //											to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
+            //										FROM
+            //											(
+            //											SELECT
+            //												mch.GOODSCODE,
+            //												SUM( mch.时间差 ) AS 时间差值,
+            //												COUNT( DISTINCT goodsmould.MOULDCODE ) AS 产量 
+            //											FROM
+            //												(
+            //												SELECT
+            //													mch.MOULDCODE,
+            //													mch.GOODSCODE,
+            //													TO_CHAR( ( ceil( ( ( mch.CREATETIME - mchh.CREATETIME ) ) * 24 ) ), 'fm9999990' ) AS 时间差 
+            //												FROM
+            //													tp_pc_mouldchangehistory mch
+            //													LEFT JOIN tp_pc_mouldchangehistory mchh ON mchh.MOULDCODE = mch.MOULDCODE 
+            //													AND mchh.operationtype = 1 
+            //												WHERE
+            //													mch.accountid = 1 
+            //													AND mch.operationtype = 6 --operationtype=1 新增入库    operationtype=6 库存上线（出库） -1为变更型号
+
+            //													AND mch.operationtype >- 1 
+            //													AND mch.createtime >= @DATEBEGIN@
+            //													AND mch.createtime <= @DATEEND@
+            //												) mch
+            //												LEFT JOIN tp_pc_mouldchangehistory goodsmould ON goodsmould.MOULDCODE = mch.MOULDCODE 
+            //											WHERE
+            //												goodsmould.accountid = 1 
+            //												AND goodsmould.operationtype = 6 
+            //												AND goodsmould.operationtype >- 1 
+            //												AND goodsmould.createtime >= @DATEBEGIN@
+            //												AND goodsmould.createtime <= @DATEEND@
+            //											GROUP BY
+            //												mch.GOODSCODE 
+            //											ORDER BY
+            //												SUM( mch.时间差 ) DESC 
+            //											) 
+            //										ORDER BY
+            //											TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
+            //										) 
+            //									WHERE
+            //										ROWNUM <= 4 UNION ALL
+            //									SELECT
+            //										* 
+            //									FROM
+            //										(
+            //										SELECT
+            //											TO_CHAR( '精坯' || GOODSCODE ) AS 地点,
+            //											GOODSCODE,
+            //											时间差值,
+            //											to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
+            //										FROM
+            //											(
+            //											SELECT
+            //												inoutPD.GOODSCODE,
+            //												SUM( 时间差 ) AS 时间差值,
+            //												COUNT( DISTINCT GOODSPD.BARCODE ) 产量 
+            //											FROM
+            //												(
+            //												SELECT
+            //													OUTPD.BARCODE,
+            //													OUTPD.GOODSCODE,
+            //													TO_CHAR( ( ceil( ( ( OUTPD.CREATETIME - INPD.CREATETIME ) * 24 ) ) ), 'fm9999990' ) AS 时间差 
+            //												FROM
+            //													TP_PM_PRODUCTIONDATA OUTPD
+            //													INNER JOIN TP_PM_PRODUCTIONDATA INPD ON OUTPD.BARCODE = INPD.BARCODE 
+            //													AND INPD.PROCEDUREID IN ( 53, 97 ) 
+            //													AND INPD.VALUEFLAG = 1 
+            //												WHERE
+            //													OUTPD.PROCEDUREID IN ( 119, 64, 81 ) 
+            //													AND OUTPD.VALUEFLAG = 1 
+            //													AND OUTPD.createtime >= @DATEBEGIN@
+            //													AND OUTPD.createtime <= @DATEEND@
+            //												) inoutPD
+            //												INNER JOIN TP_PM_PRODUCTIONDATA GOODSPD ON GOODSPD.BARCODE = inoutPD.BARCODE 
+            //											WHERE
+            //												GOODSPD.PROCEDUREID IN ( 119, 64, 81 ) 
+            //												AND GOODSPD.VALUEFLAG = 1 
+            //												AND GOODSPD.createtime >= @DATEBEGIN@
+            //												AND GOODSPD.createtime <= @DATEEND@
+            //											GROUP BY
+            //												inoutPD.GOODSCODE 
+            //											) 
+            //										ORDER BY
+            //											TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
+            //										) 
+            //									WHERE
+            //										ROWNUM <= 3 UNION ALL
+            //									SELECT
+            //										* 
+            //									FROM
+            //										(
+            //										SELECT
+            //											TO_CHAR( '施釉' || GOODSCODE ) AS 地点,
+            //											GOODSCODE,
+            //											时间差值,
+            //											to_char( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) / 24 ), 'fm9999990.0' ) ) 周转周期 
+            //										FROM
+            //											(
+            //											SELECT
+            //												inoutPD.GOODSCODE,
+            //												SUM( 时间差 ) AS 时间差值,
+            //												COUNT( DISTINCT GOODSPD.BARCODE ) 产量 
+            //											FROM
+            //												(
+            //												SELECT
+            //													OUTPD.BARCODE,
+            //													OUTPD.GOODSCODE,
+            //													TO_CHAR( ( ceil( ( ( OUTPD.CREATETIME - INPD.CREATETIME ) * 24 ) ) ), 'fm9999990' ) AS 时间差 
+            //												FROM
+            //													TP_PM_PRODUCTIONDATA OUTPD
+            //													INNER JOIN TP_PM_PRODUCTIONDATA INPD ON OUTPD.BARCODE = INPD.BARCODE 
+            //													AND INPD.PROCEDUREID IN ( 99, 65 ) 
+            //													AND INPD.VALUEFLAG = 1 
+            //												WHERE
+            //													OUTPD.PROCEDUREID IN ( 5, 101 ) 
+            //													AND OUTPD.VALUEFLAG = 1 
+            //													AND OUTPD.createtime >= @DATEBEGIN@
+            //													AND OUTPD.createtime <= @DATEEND@
+            //												) inoutPD
+            //												INNER JOIN TP_PM_PRODUCTIONDATA GOODSPD ON GOODSPD.BARCODE = inoutPD.BARCODE 
+            //											WHERE
+            //												GOODSPD.PROCEDUREID IN ( 5, 101 ) 
+            //												AND GOODSPD.VALUEFLAG = 1 
+            //												AND GOODSPD.createtime >= @DATEBEGIN@
+            //												AND GOODSPD.createtime <= @DATEEND@
+            //											GROUP BY
+            //												inoutPD.GOODSCODE 
+            //											) 
+            //										ORDER BY
+            //											TO_NUMBER( ( TO_CHAR( ( NVL( 时间差值, 0 ) / NVL( 产量, 1 ) ), 'fm9999990.0000' ) ) ) DESC 
+            //										) 
+            //									WHERE
+            //										ROWNUM <=3";
+            //             DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+            //             string jsonStr = new JsonResult(dt).ToJson();
+            //             context.Response.Write(jsonStr);
+            //         }
+            #endregion
+            if (context.Request["m"].ToString() == "Load91")
+            {
+                string sqlStr = @"
+									SELECT 
+												TO_char(T.ALLCOUNT) AS 缺陷数,
+                        TO_char(T.INSPECTITEM) AS 缺陷名称,
+                        TO_char(T.SUMCOUNT)缺陷总数,
+                        TO_char(T.SUMCOUNT1)抽检数,
+                      TO_char(DECODE(NVL(T.ALLCOUNT, 0) ,0 ,'0%' ,TO_CHAR(((NVL(T.ALLCOUNT, 0)) / DECODE(NVL(T.SUMCOUNT1, 1) ,0 ,1 ,NVL(T.SUMCOUNT1, 1))) * 100 ,'fm99990.0'))) AS 缺陷占比
+                      FROM (
+                        SELECT 
+                          COUNT(1) ALLCOUNT,
+                          TP_PM_FQCITEMSDATA.INSPECTITEM,
+                          SUM1.SUMCOUNT,
+                          SUM2.SUMCOUNT1
+                      FROM TP_PM_FQCITEMSDATA
+                      LEFT JOIN (
+                          SELECT 
+                            COUNT(1) SUMCOUNT,
+                            VALUEFLAG
+                          FROM TP_PM_FQCITEMSDATA
+                          WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
+                        AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) = TRUNC(SYSDATE)
+                        AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
+                        AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
+                          GROUP BY 
+                            VALUEFLAG
+                        ) SUM1 ON SUM1.VALUEFLAG = TP_PM_FQCITEMSDATA.VALUEFLAG
+                        LEFT JOIN (
+                          SELECT 
+                            COUNT(1) SUMCOUNT1,
+                            INSPECTITEM
+                          FROM TP_PM_FQCITEMSDATA
+                          WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
+                        AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) = TRUNC(SYSDATE)
+                        AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647) 
+                          GROUP BY 
+                            INSPECTITEM
+                        ) SUM2 ON SUM2.INSPECTITEM = TP_PM_FQCITEMSDATA.INSPECTITEM
+                      WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
+                      AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) 
+											 = TRUNC(SYSDATE)
+                      AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
+                      AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
+                      GROUP BY 
+                          TP_PM_FQCITEMSDATA.INSPECTITEM,
+                          SUM1.SUMCOUNT,
+                          SUM2.SUMCOUNT1
+                      ORDER BY 
+                          ALLCOUNT DESC 
+                      ) T
+                    WHERE ROWNUM < 6";
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-		if (context.Request["m"].ToString() == "Load91")
+            if (context.Request["m"].ToString() == "Load10")
             {
-                string sqlStr = @"SELECT 
-											T.ALLCOUNT,
-										    T.INSPECTITEM,
-										    T.SUMCOUNT,
-											DECODE(NVL(T.ALLCOUNT, 0) ,0 ,'0%' ,TO_CHAR(((NVL(T.ALLCOUNT, 0)) / DECODE(NVL(T.SUMCOUNT, 1) ,0 ,1 ,NVL(T.SUMCOUNT, 1))) * 100 ,'FM99990.00')|| '%') AS ZHANBI
-										  FROM (
-												SELECT 
-													COUNT(1) ALLCOUNT,
-													INSPECTITEM,
-													SUM1.SUMCOUNT
-											FROM TP_PM_FQCITEMSDATA
-											LEFT JOIN (
-													SELECT 
-														COUNT(1) SUMCOUNT,
-														VALUEFLAG
-													FROM TP_PM_FQCITEMSDATA
-													WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-											  AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE - 7)
-											  AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) <= TRUNC(SYSDATE)
-											  AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
-											  AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
-													GROUP BY 
-														VALUEFLAG
-												) SUM1 ON SUM1.VALUEFLAG = TP_PM_FQCITEMSDATA.VALUEFLAG
-											WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-											AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE - 7)
-											AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) <= TRUNC(SYSDATE)
-											AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
-											AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
-											GROUP BY 
-													INSPECTITEM,
-													SUM1.SUMCOUNT
-											ORDER BY 
-													ALLCOUNT DESC 
-											) T
-										WHERE ROWNUM < 5";
+                string sqlStr = @"WITH 半检检验数 AS (
+													SELECT
+													pd.GOODSCODE,
+													COUNT( DISTINCT pd.BARCODE) AS 数量
+													 FROM TP_PM_PRODUCTIONDATA pd
+													 INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE=pd.BARCODE AND gdd.TESTMOULDFLAG=0
+													WHERE pd.PROCEDUREID IN( 117,89,95,61)
+													AND pd.VALUEFLAG=1
+													AND pd.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND pd.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+													GROUP BY pd.GOODSCODE
+													),
+													半检废品数 AS (
+													SELECT
+													pd.GOODSCODE,
+													COUNT( DISTINCT pd.BARCODE) AS 数量 FROM TP_PM_SEMICHECK pd
+													 INNER JOIN TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE=pd.BARCODE AND gdd.TESTMOULDFLAG=0
+													WHERE pd.PROCEDUREID IN( 117,89,95,61,90,96)
+													AND pd.VALUEFLAG=1
+													AND pd.GOODSLEVELTYPEID in(7,13,14)
+													AND pd.CREATETIME >=TRUNC(NEXT_DAY(SYSDATE-8,1)+1)
+													AND pd.CREATETIME< TRUNC(NEXT_DAY(SYSDATE-8,1)+7)+1
+													GROUP BY pd.GOODSCODE
+													)
+													SELECT
+													*
+													FROM(
+													SELECT
+													'半检' 工序,
+													TO_CHAR(半检检验数.GOODSCODE) AS GOODSCODE,
+													半检检验数.数量 AS 检验数,
+													DECODE(NVL(半检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(半检废品数.数量, 0)) /DECODE(NVL(半检检验数.数量, 1),0,1,NVL(半检检验数.数量, 1))) * 100,'fm99990.0')) AS 废品率
+													FROM 半检检验数
+													LEFT JOIN 半检废品数 ON 半检废品数.GOODSCODE=半检检验数.GOODSCODE
+													ORDER BY  DECODE(NVL(半检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(半检废品数.数量, 0)) /DECODE(NVL(半检检验数.数量, 1),0,1,NVL(半检检验数.数量, 1))) * 100,'fm99990.0'))  DESC 
+													) WHERE ROWNUM<6
+													
+													";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);