数据核对修改

wwwroot/mes/rpt/rpt102/rpt.ashx

@@ -43,8 +43,9 @@ SELECT
                                             SELECT
                                             P.GOODSCODE AS GOODSCODE,
                                             UNITPRICE,
+                                            
                                             SUM(CASE WHEN PROCEDUREID=16 THEN 1 ELSE 0 END)出窑量,
-                                            SUM(CASE WHEN GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
+                                            COUNT(DISTINCT CASE WHEN  GOODSLEVELTYPEID IN (4,5) THEN pd.BARCODE ELSE NULL END) AS 出窑量_产量,
                                             SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
                                              TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
                                             FROM(

wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(半检)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(半检)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt203/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(打磨)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(打磨))' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt204/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦洗)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦洗)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -46,7 +46,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				string sumdefect = "";
               DataTable dts = conn.ExecuteDatatable(@"	SELECT
 	                            DISTINCT MDF.DEFECTCODE AS DFCODE,
-	                            'TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
+	                            'TO_CHAR(COUNT( DISTINCT  CASE WHEN  DF.BARCODE IS NOT NULL AND  DF.DEFECTCODE = '''||DEFECTCODE||''' THEN to_char(DF.BARCODE||MDF.DEFECTCODE ) ELSE NULL END ))' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
                            FROM TP_MST_DEFECT MDF
 															where DEFECTTYPEID=4  ORDER BY  MDF.DEFECTCODE ");
@@ -62,8 +62,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL or  MDF.DEFECTCODE='20' THEN DF.BARCODE ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL or  MDF.DEFECTCODE='20' THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+									TO_CHAR(COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '36','37','38','39','40','41','42','43','44')  THEN to_char(DF.BARCODE||MDF.DEFECTCODE ) ELSE NULL END )) 缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '36','37','38','39','40','41','42','43','44')  THEN to_char(DF.BARCODE||MDF.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                            TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt205/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(施釉)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(施釉)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt206/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦坯)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦坯)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -64,8 +64,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                TO_CHAR(	  COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                            TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt207/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(装窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(装窑)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -37,7 +37,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                     TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||MDF.DEFECTCODE||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
                             FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTCODE
+															where MDF.VALUEFLAG=1 AND(DEFECTTYPEID=7 or  MDF.DEFECTCODE=43) ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -49,7 +49,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                         'TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
 	                         FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTCODE");
+															where MDF.VALUEFLAG=1 AND(DEFECTTYPEID=7 or  MDF.DEFECTCODE=43) ORDER BY  MDF.DEFECTCODE");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();
@@ -64,8 +64,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+                               TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                            TP_PM_PRODUCTIONDATA PD
@@ -73,8 +73,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
                                 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
                                 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID 
-                                LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.VALUEFLAG=1
-                                LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND MDF.DEFECTTYPEID =7
+                                LEFT JOIN TP_PM_DEFECT DF ON PD.BARCODE = DF.BARCODE  AND DF.VALUEFLAG=1
+                                LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID AND(DEFECTTYPEID=7 or  MDF.DEFECTCODE=43)
                                 WHERE
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
@@ -106,8 +106,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												 LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
 												 LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID AND MD.DICTIONARYTYPE = 'TPC002'
 												 LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID 
-												 LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.VALUEFLAG=1
-												 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTCODE = MDF.DEFECTCODE AND MDF.DEFECTTYPEID =7
+												 LEFT JOIN TP_PM_DEFECT DF ON PD.BARCODE = DF.BARCODE  AND DF.VALUEFLAG=1
+												 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTCODE = MDF.DEFECTCODE AND(DEFECTTYPEID=7 or  MDF.DEFECTCODE=43)
 												 WHERE
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt208/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(烧窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(烧窑)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -66,8 +66,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+                               TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                            TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt209/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(出窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(出窑)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -36,8 +36,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(GD.GOODSSPECIFICATION) AS 产品规格,
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
-	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-									TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
+	                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
 									TO_CHAR( (COUNT(DISTINCT DF.BARCODE)/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                             CASE WHEN GD.GOODSNAME IS NULL THEN
 									TO_CHAR( ( SUM( CASE WHEN DF.DEFECTCODE = '87' THEN 1 ELSE 0 END ) / COUNT( DISTINCT PD.BARCODE ) * 100 ),'fm99990.00' ) || '%' 

wwwroot/mes/rpt/rpt210/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(原料)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(原料)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt211/rpt_index.html

@@ -135,7 +135,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(注浆工个人质量分析报表（成型车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(注浆工个人质量分析报表（成型车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt212/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(打磨工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(打磨工个人质量分析报表（精修车间）)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt213/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(刷洗工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(刷洗工个人质量分析报表（精修车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt214/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(半检工个人质量分析报表（半检车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(半检工个人质量分析报表（半检车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -29,13 +29,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	SELECT
 												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
-	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=127 
-															THEN  TO_CHAR(  ( SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
+	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=126 
+															THEN  	TO_CHAR(( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
 	                              ELSE
-                                    TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
+                                    TO_CHAR( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) ) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=4  ORDER BY  MDF.DEFECTID" );//半检获取 成型全部缺陷
+															where DEFECTTYPEID=4  ORDER BY  MDF.DEFECTID" );
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -54,26 +54,24 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
 
 
-				string sqlStr = @"WITH 部门 AS (
-                                        SELECT  GROUTINGLINEID,
-                                        CASE WHEN HIGHPRESSUREFLAG=1 THEN'高压' else TO_CHAR(SUBSTR(GROUTINGLINECODE, 1, 2)) END AS 部门
-                                        FROM  TP_PC_GROUTINGLINE
-                                        ),基础数据 AS 
+				string sqlStr = @"WITH 基础数据 AS 
                                         (
-                                        SELECT
-                                        		GDL.GROUTINGLINEID,
-                                        	STF.STAFFCODE  AS 工号,
-                                        	STF.STAFFNAME AS 姓名,GD.GOODSCODE AS 产品编码,
+                                      SELECT
+                                        	
+                                        	CASE  WHEN  PDC.PROCEDUREID=41 THEN 'Y26'  ELSE TO_CHAR(STF.STAFFCODE) END  AS 工号,
+                                        	CASE  WHEN  PDC.PROCEDUREID=41 THEN '李跃'  ELSE TO_CHAR(STF.STAFFNAME) END    AS 姓名,
+																					jobs.JOBSNAME,jobs.JOBSID,
+																					GD.GOODSCODE AS 产品编码,
                                         	GD.GOODSNAME AS 产品名称,
                                         	GD.GOODSSPECIFICATION AS 产品规格,
                                         	MD.DICTIONARYVALUE AS 釉色,
                                         	LG.LOGONAME AS 商标,
                                         	PD.BARCODE 出窑条码,
                                         	DF.BARCODE 缺陷条码,
-												CASE WHEN  PDC.PROCEDUREID=10 THEN  '人工' 
-																					     WHEN  PDC.PROCEDUREID=37 THEN  '机械手单柜' 
-																							 WHEN  PDC.PROCEDUREID=41 THEN  '1拖4机械手'  ELSE NULL END    工序,
-                                        	DF.DEFECTID 缺陷ID
+											CASE WHEN  PDC.PROCEDUREID=10 THEN  '人工' 
+												WHEN  PDC.PROCEDUREID=37 THEN  '机械手单柜' 
+												WHEN  PDC.PROCEDUREID=41 THEN  '1拖4机械手'  ELSE NULL END    工序,
+                                        	DF.DEFECTID 缺陷ID,	df.DEFECTCODE 缺陷编码
                                         FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
@@ -83,53 +81,58 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
                                         	LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.DEFECTID IN (
-													SELECT  DISTINCT 		 MDF.DEFECTID
-															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=4 )  AND DF.VALUEFLAG=1
+																										SELECT  DISTINCT 		 MDF.DEFECTID  FROM TP_MST_DEFECT MDF where DEFECTTYPEID=4 )  AND DF.VALUEFLAG=1
 											INNER JOIN TP_PM_PRODUCTIONDATA PDC ON PDC.BARCODE=GDL.BARCODE AND PDC.PROCEDUREID IN (	10,37,41) AND PDC.VALUEFLAG=1
 											LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PDC.CLASSESSETTINGID
 											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
+											LEFT JOIN TP_MST_JOBS jobs ON jobs.JOBSID=stf.JOBS 
                                         WHERE
-                                        	PD.PROCEDUREID IN ( 16) 
+                                        	PD.PROCEDUREID IN ( 16) AND STF.JOBS IN(8,20,32)
                                            AND PD.CREATETIME >= @DATEBEGIN@
-                                           AND PD.CREATETIME < @DATEEND@ 
-                                        	 
+                                           AND PD.CREATETIME < @DATEEND@  
                                         	AND PD.VALUEFLAG = 1
-										GROUP BY GDL.GROUTINGLINEID,
+										GROUP BY 
                                         	STF.STAFFCODE  ,
-                                        	STF.STAFFNAME ,GD.GOODSCODE,
+                                        	STF.STAFFNAME ,
+											GD.GOODSCODE,
                                         	GD.GOODSNAME ,
                                         	GD.GOODSSPECIFICATION ,
                                         	MD.DICTIONARYVALUE ,
                                         	LG.LOGONAME ,
+											jobs.JOBSID,
                                         	PD.BARCODE ,
-                                        	DF.BARCODE ,PDC.PROCEDUREID,DF.DEFECTID
+											PDC.USERCODE,	
+											jobs.JOBSNAME,
+                                        	DF.BARCODE ,
+											PDC.PROCEDUREID,
+											DF.DEFECTID	,df.DEFECTCODE 
                                         )
                                         SELECT * FROM(
                                         SELECT
-                                        GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序) AS GID,
-                                        CASE when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=254 THEN TO_CHAR(基础数据.工序)
-																				when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=255 THEN '总计'
-                                        	 when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=31 THEN'小计'ELSE NULL END AS 统计方式,
-                                       TO_CHAR(基础数据.工号) AS 工号,TO_CHAR(基础数据.姓名)姓名,
+                                        GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序) AS GID,
+                                        CASE when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=126 THEN TO_CHAR(基础数据.工序)
+																						 when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=127 THEN '总计'
+                                        	   when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=30 THEN'小计'ELSE NULL END AS 统计方式,
+                                       TO_CHAR(基础数据.工号) AS 工号,
+																			 TO_CHAR(基础数据.姓名)姓名,
 										TO_CHAR(基础数据.产品编码)产品编码,
                                         TO_CHAR(基础数据.产品名称)产品名称,
                                         TO_CHAR(基础数据.产品规格)产品规格,
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
-                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+										TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
+                                        TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据
-                                        LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
+																		 
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
                                         
                                         	GROUP BY			Grouping sets ( ( 
 																	基础数据.工号,
 																	基础数据.姓名,
 																	基础数据.工序,
-																	部门.部门,基础数据.产品编码,
+																	基础数据.产品编码,
 																	基础数据.产品名称,
 																	基础数据.产品规格,
 																	基础数据.釉色,
@@ -140,13 +143,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						*
 						FROM(
 																	SELECT 
-																GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序) AS GID,
-                                        CASE when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=254 THEN TO_CHAR(基础数据.工序)
-																						 when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=255 THEN '总计'
-                                        	   when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=31 
-																									THEN'小计'ELSE NULL END AS 统计方式,TO_CHAR(基础数据.工号) AS 工号,
+																GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序) AS GID,
+                                        CASE when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=126 THEN TO_CHAR(基础数据.工序)
+																						 when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=127 THEN '总计'
+                                        	   when GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标,基础数据.工序)=30 THEN'小计'ELSE NULL END AS 统计方式,
+																									TO_CHAR(基础数据.工号) AS 工号,
                                        TO_CHAR(基础数据.姓名)姓名,
-										TO_CHAR(基础数据.产品编码)产品编码,
+																			TO_CHAR(基础数据.产品编码)产品编码,
                                         TO_CHAR(基础数据.产品名称)产品名称,
                                         TO_CHAR(基础数据.产品规格)产品规格,
                                         TO_CHAR(基础数据.釉色)釉色,
@@ -155,21 +158,22 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         '' 缺陷量,
                                         '' 缺陷率,
 																				{DEFECTSUM}  
+
 															FROM 基础数据
-                                        LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
+                                 
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
                                         	GROUP BY			Grouping sets ( ( 
 																	基础数据.工号,
 																	基础数据.姓名,
 																	基础数据.工序,
-																	部门.部门,基础数据.产品编码,
+																	基础数据.产品编码,
 																	基础数据.产品名称,
 																	基础数据.产品规格,
 																	基础数据.釉色,
 																	基础数据.商标), (基础数据.工号,基础数据.姓名,基础数据.工序),(基础数据.工序),())
 
 																				)
-                                        WHERE GID IN (254,255)
+                                        WHERE GID IN (126,127)
                                         
 		) ORDER BY 姓名,工号,GID,统计方式
 
@@ -179,7 +183,6 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				List<CDAParameter> sqlPara = new List<CDAParameter>();
 				sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
-				sqlPara.Add(new CDAParameter("GROUTINGLINECODE", context.Request["GROUTINGLINECODE"], DataType.NVarChar));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
 				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(施釉工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(施釉工个人质量分析报表（施釉车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -27,15 +27,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
-							SELECT  DISTINCT
-															 MDF.DEFECTID,
-	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=127 
-															THEN  TO_CHAR(  ( SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
+							SELECT
+												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
+	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=126 
+															THEN  	TO_CHAR(( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
 	                              ELSE
-                                    TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
+                                    TO_CHAR( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) ) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20' ORDER BY  MDF.DEFECTID");
+															where DEFECTTYPEID=5 or MDF.DEFECTCODE='20' ORDER BY  MDF.DEFECTID");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -43,12 +43,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				}
 
 						string sumdefect = "";
-              DataTable dts = conn.ExecuteDatatable(@"SELECT DISTINCT
-															 MDF.DEFECTID,
-                                                        'TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
-	                                                 MDF.DEFECTNAME 
-															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20' ORDER BY  MDF.DEFECTID");
+              DataTable dts = conn.ExecuteDatatable(@"SELECT
+	                           DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
+	                            'TO_CHAR(SUM( CASE WHEN MDF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
+	                            MDF.DEFECTNAME 
+                           	FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=5 or MDF.DEFECTCODE='20' ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();
@@ -62,9 +62,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         ),基础数据 AS 
                                         (
                                         SELECT
-                                          	GDL.GROUTINGLINEID,
-                                        	PDC.USERCODE AS 工号,
-                                        	STF.STAFFNAME AS 姓名,GD.GOODSCODE AS 产品编码,
+                                        	GDL.GROUTINGLINEID,
+                                        	CASE  WHEN  PDC.PROCEDUREID=41 THEN PDC.USERCODE  ELSE STF.STAFFCODE END  AS 工号,
+                                        	STF.STAFFNAME AS 姓名,
+											jobs.JOBSNAME,jobs.JOBSID,
+											GD.GOODSCODE AS 产品编码,
                                         	GD.GOODSNAME AS 产品名称,
                                         	GD.GOODSSPECIFICATION AS 产品规格,
                                         	MD.DICTIONARYVALUE AS 釉色,
@@ -74,7 +76,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											CASE WHEN  PDC.PROCEDUREID=10 THEN  '人工' 
 												WHEN  PDC.PROCEDUREID=37 THEN  '机械手单柜' 
 												WHEN  PDC.PROCEDUREID=41 THEN  '1拖4机械手'  ELSE NULL END    工序,
-                                        	DF.DEFECTID 缺陷ID
+                                        	DF.DEFECTID 缺陷ID,	df.DEFECTCODE 缺陷编码
                                       FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
@@ -88,21 +90,28 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20')  AND DF.VALUEFLAG=1
 											INNER JOIN TP_PM_PRODUCTIONDATA PDC ON PDC.BARCODE=GDL.BARCODE AND PDC.PROCEDUREID IN (10,37,41)AND PDC.VALUEFLAG=1
 											LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PDC.CLASSESSETTINGID
-											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID 
+											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
+											LEFT JOIN TP_MST_JOBS jobs ON jobs.JOBSID=stf.JOBS
                                         WHERE
                                         	PD.PROCEDUREID IN (16) AND STF.JOBS=22
                                             AND PD.CREATETIME >= @DATEBEGIN@
                                             AND PD.CREATETIME < @DATEEND@ 
                                         	AND PD.VALUEFLAG = 1
-											GROUP BY 							GDL.GROUTINGLINEID,
-                                        	PDC.USERCODE ,
-                                        	STF.STAFFNAME ,GD.GOODSCODE,
+												GROUP BY GDL.GROUTINGLINEID,
+                                        	STF.STAFFCODE  ,
+                                        	STF.STAFFNAME ,
+											GD.GOODSCODE,
                                         	GD.GOODSNAME ,
                                         	GD.GOODSSPECIFICATION ,
                                         	MD.DICTIONARYVALUE ,
                                         	LG.LOGONAME ,
+											jobs.JOBSID,
                                         	PD.BARCODE ,
-                                        	DF.BARCODE ,PDC.PROCEDUREID,DF.DEFECTID
+											PDC.USERCODE,	
+											jobs.JOBSNAME,
+                                        	DF.BARCODE ,
+											PDC.PROCEDUREID,
+											DF.DEFECTID,	df.DEFECTCODE 
                                         )
                                       SELECT * FROM(  
                                         SELECT
@@ -117,8 +126,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
-                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+                                        TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
+                                        TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
@@ -164,7 +173,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																	基础数据.产品规格,
 																	基础数据.釉色,
 																	基础数据.商标), (基础数据.工号,基础数据.姓名,基础数据.工序),(基础数据.工序),()) )
-                                        WHERE GID IN (254,255)  ) ORDER BY 姓名,统计方式,工号 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
+                                        WHERE GID IN (126,127)  ) ORDER BY 姓名,统计方式,工号 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(擦坯工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(擦坯工个人质量分析报表（施釉车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -27,12 +27,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
-							SELECT  DISTINCT
-															 MDF.DEFECTID,
-	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=127 
-															THEN  TO_CHAR(  ( SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
+							SELECT
+												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
+	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=126 
+															THEN  	TO_CHAR(( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
 	                              ELSE
-                                    TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
+                                    TO_CHAR( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) ) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
 															where DEFECTTYPEID=6 ORDER BY  MDF.DEFECTID");
@@ -70,7 +70,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LG.LOGONAME AS 商标,
                                         	PD.BARCODE 出窑条码,
                                         	DF.BARCODE 缺陷条码,
-                                        		DF.DEFECTID 缺陷ID
+                                        	DF.DEFECTID 缺陷ID,	df.DEFECTCODE 缺陷编码
                                         FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
@@ -79,7 +79,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.DEFECTID IN (
+                                        	LEFT JOIN TP_PM_DEFECT DF ON PD.BARCODE = DF.BARCODE  AND DF.DEFECTID IN (
 													SELECT  DISTINCT 		 MDF.DEFECTID
 															FROM TP_MST_DEFECT MDF
 															where DEFECTTYPEID=6 )  AND DF.VALUEFLAG=1
@@ -100,7 +100,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	MD.DICTIONARYVALUE ,
                                         	LG.LOGONAME ,
                                         	PD.BARCODE ,
-                                        	DF.BARCODE ,DF.DEFECTID
+                                        	DF.BARCODE ,DF.DEFECTID,df.DEFECTCODE
                                         )
                                    SELECT * FROM(     
                                         SELECT
@@ -115,8 +115,8 @@ TO_CHAR(基础数据.工号) 工号,
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
-                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+                                        TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
+                                        TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
@@ -149,7 +149,7 @@ TO_CHAR(基础数据.工号) 工号,
 															FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
-                                        AND MDF.DEFECTTYPEID = 1 
+                                      
 		) ORDER BY 姓名,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -84,7 +84,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(装窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(装窑工个人质量分析报表（烧成车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -26,16 +26,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
 				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
-				DataTable dt = conn.ExecuteDatatable(@"	
-						SELECT  DISTINCT
-															 MDF.DEFECTID,
-	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=127 
-															THEN  TO_CHAR(  ( SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
+				DataTable dt = conn.ExecuteDatatable(@"		
+							SELECT
+												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
+	                            'CASE WHEN GROUPING_ID(基础数据.工号,基础数据.姓名,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=126 
+															THEN  	TO_CHAR(( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) / COUNT(DISTINCT 出窑条码) * 100 ), ''fm99990.00'' ) || ''%''
 	                              ELSE
-                                    TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
+                                    TO_CHAR( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||MDF.DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) ) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTID");
+															where MDF.VALUEFLAG=1 AND( MDF.DEFECTTYPEID=7 or  MDF.DEFECTCODE=43) ORDER BY  MDF.DEFECTID");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -45,10 +45,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				string sumdefect = "";
               DataTable dts = conn.ExecuteDatatable(@"SELECT DISTINCT
 															 MDF.DEFECTID,
-                                                        'TO_CHAR(SUM( CASE WHEN MDF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
+                                                        '
+  TO_CHAR( COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 基础数据.缺陷编码 = '''||DEFECTCODE||''' THEN to_char(缺陷条码||基础数据.缺陷ID ) ELSE NULL END ) )' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
-	                            FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTID");
+								FROM TP_MST_DEFECT MDF
+															where MDF.VALUEFLAG=1 AND(DEFECTTYPEID=7 or  MDF.DEFECTCODE=43)  ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();
@@ -70,7 +71,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	MD.DICTIONARYVALUE AS 釉色,
                                         	LG.LOGONAME AS 商标,
                                         	DF.BARCODE 缺陷条码,
-												DF.DEFECTID 缺陷ID
+											DF.DEFECTID 缺陷ID,	df.DEFECTCODE 缺陷编码
                                         FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
@@ -79,10 +80,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.DEFECTID IN (SELECT  DISTINCT
-															 MDF.DEFECTID
-															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=7 )  AND DF.VALUEFLAG=1
+                                        	LEFT JOIN TP_PM_DEFECT DF ON PD.BARCODE = DF.BARCODE  AND DF.DEFECTCODE IN (SELECT DISTINCT  MDF.DEFECTCODE
+																							  FROM TP_MST_DEFECT MDF where MDF.VALUEFLAG=1 AND( DEFECTTYPEID=7 or  MDF.DEFECTCODE='43' ) )  AND DF.VALUEFLAG=1
 											INNER JOIN TP_PM_PRODUCTIONDATA PDC ON PDC.BARCODE=GDL.BARCODE AND PDC.PROCEDUREID IN (30,39,57) AND PDC.VALUEFLAG=1
 											LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PDC.CLASSESSETTINGID
 											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
@@ -100,7 +99,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	GD.GOODSSPECIFICATION ,
                                         	MD.DICTIONARYVALUE  ,
                                         	LG.LOGONAME ,
-                                        	DF.BARCODE,DF.DEFECTID
+                                        	DF.BARCODE ,DF.DEFECTID,df.DEFECTCODE
                                         )
                                  SELECT * FROM(       
                                       SELECT
@@ -114,8 +113,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
-                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+                                         TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
+                                        TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
 										{DEFECT}
                                         FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
@@ -141,7 +140,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
-                                        AND MDF.DEFECTTYPEID = 1 
+                                       
 		) ORDER BY 姓名,GID ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -86,7 +86,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(烧窑工个人质量分析报表（烧成车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -71,7 +71,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	MD.DICTIONARYVALUE AS 釉色,
                                         	LG.LOGONAME AS 商标,
                                         	DF.BARCODE 缺陷条码,
-												DF.DEFECTID 缺陷ID
+											DF.DEFECTID 缺陷ID,	df.DEFECTCODE 缺陷编码
                                         FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
@@ -101,7 +101,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	GD.GOODSSPECIFICATION ,
                                         	MD.DICTIONARYVALUE  ,
                                         	LG.LOGONAME ,
-                                        	DF.BARCODE,DF.DEFECTID
+                                        	DF.BARCODE ,DF.DEFECTID,df.DEFECTCODE
                                         )
                                SELECT * FROM(         
                                         SELECT
@@ -116,8 +116,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
-                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+                                        TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
+                                        TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
@@ -150,7 +150,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															FROM 基础数据
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
-                                        AND MDF.DEFECTTYPEID = 1 
+                                        
 		)ORDER BY 姓名,GID
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);

wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(出窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(出窑工个人质量分析报表（烧成车间）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt220/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧成车间烧窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间烧窑工质量分析报表' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt221/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧成车间出窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间出窑工质量分析报表' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt223/rpt_index.html

@@ -98,7 +98,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份成型车间缺陷发生率).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(月份成型车间缺陷发生率' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt224/rpt_index.html

@@ -93,7 +93,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份烧成车间质量缺陷表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(月份烧成车间质量缺陷表' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt225/rpt_index.html

@@ -90,7 +90,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份施釉车间缺陷分析表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(月份施釉车间缺陷分析表' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt226/rpt_index.html

@@ -92,7 +92,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(个人质量分析日报表（回烧修补工）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(个人质量分析日报表（回烧修补工）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt303/rpt_index.html

@@ -118,7 +118,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(产品统计表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(产品统计表' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -48,21 +48,21 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									
 									TO_CHAR(COUNT( DISTINCT  CASE WHEN df.DEFECTCODE IN ( '83','84')  THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 烧成缺陷_出窑缺陷_缺陷汇总,
 
-									SUM( CASE WHEN df.DEFECTCODE IN ( '86', '87','086', '88'  ) THEN 1 ELSE 0 END ) AS 原料缺陷_缺陷汇总,
-									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '91', '92', '93', '083', '084') THEN 1 ELSE 0 END ) AS 冷修_缺陷汇总,
-									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '091', '092', '093', '96') THEN 1 ELSE 0 END ) AS 回烧修补_缺陷汇总,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '86', '87','086', '88'  ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 原料缺陷_缺陷汇总,
+
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '91', '92', '93', '083', '084') THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 冷修_缺陷汇总,
+					
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '091', '092', '093', '96') THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 回烧修补_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '061', '062', '063', '064', '065', '066', '067' ) THEN 1 ELSE 0 END ) AS 回烧装窑_缺陷汇总,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '061', '062', '063', '064', '065', '066', '067' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 回烧装窑_缺陷汇总,
+								
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '069', '070', '071', '43', '073', '074', '075', '076', '077', '078', '079', '080' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 回烧烧窑_缺陷汇总,
+								
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0083', '0084' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 回烧出窑_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '069', '070', '071', '43', '073', '074', '075', '076', '077', '078', '079', '080' ) THEN 1 ELSE 0 END ) AS 回烧烧窑_缺陷汇总,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '98'  ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 研磨_缺陷汇总,									
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '0083', '0084' ) THEN 1 ELSE 0 END ) AS 回烧出窑_缺陷汇总,
-
-									SUM( CASE WHEN df.DEFECTCODE IN ( '98'  ) THEN 1 ELSE 0 END ) AS 研磨_缺陷汇总,									
-	
-									SUM( CASE WHEN df.DEFECTCODE IN ( '99', '100', '099', '0100' ) THEN 1 ELSE 0 END ) AS 其他_缺陷汇总
+									TO_CHAR(COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '99', '100', '099', '0100' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) AS 其他_缺陷汇总
 
 							FROM
 								TP_PM_DEFECT df
@@ -88,6 +88,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GD.GOODSCODE) END AS GOODSCODE,
 									GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
 								gd.GOODSNAME,gtp.GOODSTYPENAME,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '01' )  THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_坯脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '02' )  THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_棕眼,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '03' )  THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_裂底,
@@ -127,28 +128,32 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '002' ) THEN DF.BARCODE ELSE NULL E
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '1' )   THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_内漏不合格,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '2' )   THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_外漏不合格,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '3' )   THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_试水不合格,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '10' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_糙活,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '12' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_变形,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '13' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_渣,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '14' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_管道渣,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '15' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_孔眼不良,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '16' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_睹眼,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '17' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_眼歪,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '18' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_丢气孔,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '19' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_丢眼,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '20' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_坯磕,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '01' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_坯脏,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '02' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_棕眼,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '03' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂底,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '04' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂圈,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '05' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂鼻子,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '06' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂水道,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '07' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂管,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '08' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_沾接裂,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '09' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂眼,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '10' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_糙活,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '25' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_卡球,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '34' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂,
+
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '10' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_糙活,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '12' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_变形,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '13' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_渣,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '14' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_管道渣,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '15' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_孔眼不良,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '16' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_睹眼,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '17' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_眼歪,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '18' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_丢气孔,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '19' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_丢眼,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (4,36,53) AND df.DEFECTCODE IN ( '20' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_坯磕,
+
+
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '01' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_坯脏,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '02' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_棕眼,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '03' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂底,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '04' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂圈,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '05' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂鼻子,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '06' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂水道,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '07' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂管,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '08' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_沾接裂,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '09' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂眼,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '10' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_糙活,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '25' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_卡球,
+count( DISTINCT CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND df.DEFECTCODE IN ( '34' )  THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_刷洗缺陷_裂,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '36' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_滚釉,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '37' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_釉薄,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '38' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_釉不匀,
@@ -158,6 +163,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '41' )  THEN DF.BARCODE ELSE NULL E
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '42' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_釉绺,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '43' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_针孔,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '44' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_施釉缺陷_色脏,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '47' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_灌釉不良,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '48' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_擦脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '49' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_崩标,
@@ -170,40 +176,48 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '55' )  THEN DF.BARCODE ELSE NULL E
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '56' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_灌磕,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '20' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_坯磕,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '57' )  THEN DF.BARCODE ELSE NULL END ) AS 施釉擦坯缺陷_擦坯缺陷_碱石,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '61' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_落脏,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '62' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装沾,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '63' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装磕,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '64' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装裂,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '65' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装走,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '66' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装脏,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '67' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_缺釉,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '69' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_水滴,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '70' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_窑脏,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '71' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧裂,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '43' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_针孔,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '73' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_风惊,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '74' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧生,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '75' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_串烟,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '76' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧坑,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '77' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_桔釉,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '78' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_过火,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '79' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_火燎,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '80' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧走,
+
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '61' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_落脏,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '62' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装沾,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '63' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装磕,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '64' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装裂,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '65' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装走,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '66' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_装脏,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '67' ) AND PDS.PROCEDUREID IN (55,13,25) THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_装窑缺陷_缺釉,
+
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '69' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_水滴,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '70' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_窑脏,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '71' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧裂,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '43' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_针孔,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '73' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_风惊,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '74' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧生,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '75' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_串烟,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '76' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧坑,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '77' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_桔釉,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '78' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_过火,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '79' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_火燎,
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '80' ) AND PDS.PROCEDUREID IN (30,39,57)  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_烧窑缺陷_烧走,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '83' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_出窑缺陷_磕碰,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '84' )  THEN DF.BARCODE ELSE NULL END ) AS 烧成缺陷_出窑缺陷_划釉,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '86' )  THEN DF.BARCODE ELSE NULL END ) AS 原料缺陷_泥料缺陷_铜脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '87' )  THEN DF.BARCODE ELSE NULL END ) AS 原料缺陷_泥料缺陷_料脏,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '086' ) THEN DF.BARCODE ELSE NULL END ) AS 原料缺陷_釉料缺陷_铜脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '88' )  THEN DF.BARCODE ELSE NULL END ) AS 原料缺陷_釉料缺陷_铁脏,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '91' )  THEN DF.BARCODE ELSE NULL END ) AS 冷修缺陷_修补不良,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '92' )  THEN DF.BARCODE ELSE NULL END ) AS 冷修缺陷_漏修,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '93' )  THEN DF.BARCODE ELSE NULL END ) AS 冷修缺陷_漏检,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '083' )  THEN DF.BARCODE ELSE NULL END ) AS 冷修缺陷_磕碰,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '084' )  THEN DF.BARCODE ELSE NULL END ) AS 冷修缺陷_划釉,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '091' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧修补缺陷_修补不良,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '092' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧修补缺陷_漏修,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '093' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧修补缺陷_漏检,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '96' )   THEN DF.BARCODE ELSE NULL END ) AS 回烧修补缺陷_白点,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '061' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_落脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '062' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_装沾,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '063' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_装磕,
@@ -211,6 +225,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '064' )  THEN DF.BARCODE ELSE NULL
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '065' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_装走,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '066' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_装脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '067' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_装窑缺陷_缺釉,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '069' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_水滴,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '070' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_窑脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '071' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_烧裂,
@@ -223,10 +238,13 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '077' )  THEN DF.BARCODE ELSE NULL
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '078' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_过火,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '079' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_火燎,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '080' )  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_烧窑缺陷_烧走,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0083')  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_出窑缺陷_磕碰,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0084')  THEN DF.BARCODE ELSE NULL END ) AS 回烧缺陷_出窑缺陷_划釉,
+
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '98' )   THEN DF.BARCODE ELSE NULL END ) AS 研磨缺陷_研磨不良,
-count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '99' )  THEN DF.BARCODE ELSE NULL END ) AS 其他_隧道窑其他蹦脏,
+
+count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '99' )   THEN DF.BARCODE ELSE NULL END ) AS 其他_隧道窑其他蹦脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '100' )  THEN DF.BARCODE ELSE NULL END ) AS 其他_隧道窑其他试验不良,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '099' )  THEN DF.BARCODE ELSE NULL END ) AS 其他_梭式窑其他蹦脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN DF.BARCODE ELSE NULL END ) AS 其他_梭式窑其他试验不良
@@ -234,6 +252,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN DF.BARCODE ELSE NULL
 								TP_PM_DEFECT df
 									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON  df.BARCODE = gd.BARCODE 
 									LEFT JOIN TP_PM_PRODUCTIONDATA PD ON PD.BARCODE=DF.BARCODE 
+									INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
 									LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTID = MDF.DEFECTID 
@@ -273,7 +292,7 @@ row_number() over (partition by BARCODE order by GOODSLEVELTYPEID DESC ) as rown
 									TP_PM_PRODUCTIONDATA pd
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
 									LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
-									LEFT  JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE=PD.BARCODE AND PDS.PROCEDUREID=60
+									LEFT  JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE=PD.BARCODE AND PDS.PROCEDUREID=60 AND PDS.VALUEFLAG=1
 								WHERE
 									PD.VALUEFLAG = 1 
 									AND PD.PROCEDUREID = 16 

wwwroot/mes/rpt/rpt304/rpt_index.html

@@ -226,7 +226,7 @@
 
 		//导出
 		function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(卫生陶瓷欠点).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls' );
+            $('#DataGridMaster').datagrid('toExcel', '(卫生陶瓷欠点)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls' );
 		}
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -32,33 +32,35 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 {
                         sqlStr = @" WITH 数据源 AS ( SELECT
                                                  CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
-													  WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
-												GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
+																										 WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
+																										GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
                                                 GOODSSPECIFICATION 产品规格,
-												GOODSTYPENAME 产品类别,
-                                                COUNT(DISTINCT  BARCODE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID  IN (6,7,9) OR REWORKPROCEDUREID IN(24,42) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_残品,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%A%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%B%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%C%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID NOT IN (1,2,3,4,5,6,7,8,9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
+																								GOODSTYPENAME 产品类别,
+                                                COUNT(DISTINCT BARCODE ) as 出窑量_出窑量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (4,36,53) AND DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (5,36,52) AND DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
+                                                COUNT(DISTINCT CASE WHEN    DEFECTCODE IN (SELECT DEFECTCODE  FROM TP_MST_DEFECT WHERE DEFECTTYPEID NOT IN(1,4,5,6,7,8)
+                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN BARCODE ELSE NULL END) 其他缺陷
                                                 FROM(
                                                 SELECT
-                                                DISTINCT pd.BARCODE,
+                                                DISTINCT pd.BARCODE,PDS.PROCEDUREID AS PROCEDUREIDS,
+												PD.REWORKPROCEDUREID,
                                                 pd.GROUTINGLINECODE,
                                                 pd.GOODSCODE,
                                                 pd.GOODSNAME,
@@ -68,11 +70,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 TP_MST_DataDictionary.DICTIONARYVALUE,
                                                 DEFECT.DEFECTTYPEID,
                                                 DEFECT.DEFECTCODE,
-                                                GL.HIGHPRESSUREFLAG,REWORKPROCEDUREID,
-                                                pd.PROCEDUREID AS  PROCEDUREID,
+                                                GL.HIGHPRESSUREFLAG,
+                                                pd.PROCEDUREID AS PROCEDUREID,
 												gtp.GOODSTYPENAME
-                                                FROM
+                                      FROM
                                                 TP_PM_PRODUCTIONDATA pd
+												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE
                                                 LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
 												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1 
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
@@ -207,36 +210,36 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
                 else if (procedure == "回烧")
                 {
-                           sqlStr = @"  WITH 数据源 AS (SELECT
-                                                CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
+                           sqlStr = @"  WITH 数据源 AS (
+                                        SELECT CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
 													WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
 													GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
                                                 GOODSSPECIFICATION 产品规格,
-																								GOODSTYPENAME 产品类别,
-                                                COUNT(DISTINCT LENGBUBARCOE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_残品,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
+												GOODSTYPENAME 产品类别,
+                                                COUNT(DISTINCT BARCODE ) as 出窑量_出窑量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (4,36,53) AND DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (5,36,52) AND DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
                                                 COUNT(DISTINCT CASE WHEN    DEFECTCODE IN (SELECT DEFECTCODE  FROM TP_MST_DEFECT WHERE DEFECTTYPEID NOT IN(1,4,5,6,7,8)
-                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
+                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN BARCODE ELSE NULL END) 其他缺陷
                                                 FROM(
                                     SELECT
-                                                DISTINCT pd.BARCODE,
+                                                DISTINCT pd.BARCODE,PDS.PROCEDUREID AS PROCEDUREIDS,
 												PD.REWORKPROCEDUREID,
                                                 pd.GROUTINGLINECODE,
 												PDL.BARCODE AS LENGBUBARCOE,
@@ -251,10 +254,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 GL.HIGHPRESSUREFLAG,
                                                 pd.PROCEDUREID AS PROCEDUREID,
 												gtp.GOODSTYPENAME
-                                                FROM
+                                      FROM
                                                 TP_PM_PRODUCTIONDATA pd
+												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
-																								LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
+												LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
                                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
                                                 LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
@@ -275,7 +279,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%C%'  THEN PD.BARCODE ELSE NULL END )) 成C出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  GL.HIGHPRESSUREFLAG =1  THEN PD.BARCODE ELSE NULL END )) 高压出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (4,36,53)  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
-											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (5,36,52)  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
+											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (5,36,52)  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =6  THEN PD.BARCODE ELSE NULL END )) 半检出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 施釉出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 擦坯出窑量,
@@ -375,35 +379,35 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         WHERE GID=3 ) ORDER BY 产品类别,产品编码 ";
                 }
                 else if (procedure == "冷修") { 
-                    sqlStr = @" WITH 数据源 AS (SELECT
-                                                  CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
-													   WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
-												GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
+                    sqlStr = @" WITH 数据源 AS ( SELECT CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
+													WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
+													GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
-                                                GOODSSPECIFICATION 产品规格,GOODSTYPENAME 产品类别,
-                                                COUNT(DISTINCT LENGBUBARCOE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN    GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN    GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
+                                                GOODSSPECIFICATION 产品规格,
+												GOODSTYPENAME 产品类别,
+                                                COUNT(DISTINCT BARCODE ) as 出窑量_出窑量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
                                                 COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (4,36,53) AND DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   PROCEDUREIDS IN (5,36,52) AND DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
                                                 COUNT(DISTINCT CASE WHEN    DEFECTCODE IN (SELECT DEFECTCODE  FROM TP_MST_DEFECT WHERE DEFECTTYPEID NOT IN(1,4,5,6,7,8)
-                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
+                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN BARCODE ELSE NULL END) 其他缺陷
                                                 FROM(
                                     SELECT
-                                                DISTINCT pd.BARCODE,
+                                                DISTINCT pd.BARCODE,PDS.PROCEDUREID AS PROCEDUREIDS,
 												PD.REWORKPROCEDUREID,
                                                 pd.GROUTINGLINECODE,
 												PDL.BARCODE AS LENGBUBARCOE,
@@ -417,11 +421,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 DEFECT.DEFECTCODE,
                                                 GL.HIGHPRESSUREFLAG,
                                                 pd.PROCEDUREID AS PROCEDUREID,
-																								gtp.GOODSTYPENAME
+												gtp.GOODSTYPENAME
                                                 FROM
                                                 TP_PM_PRODUCTIONDATA pd
+                                                INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
-																								LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
+												LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
                                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
                                                 LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID

wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -103,7 +103,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析汇总表（此表包括冷修、重烧质量分析表）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析汇总表（此表包括冷修、重烧质量分析表）)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
 		//搜索按钮

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -99,7 +99,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成型注浆报表（结转时间为天）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(成型注浆报表（结转时间为天）' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
 		//搜索按钮

wwwroot/mes/rpt/rpt307/rpt_index.html

@@ -101,7 +101,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(施釉精坯存量报表(结转周期天：精坯库出-釉坯库入)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            $('#DataGridMaster').datagrid('toExcel', '(施釉精坯存量报表(结转周期天：精坯库出-釉坯库入)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {