修改关联 字段 增加施釉缺陷 部分报表导出改变方式

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -75,12 +75,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(TP_MST_DataDictionary.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(logo.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.DEFECTTYPEID=1 AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN DF.BARCODE ELSE NULL END )) AS 缺陷量,
 	                                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') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                              TP_PM_PRODUCTIONDATA PD
-                                  LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
+                                  LEFT JOIN TP_PM_DEFECT df ON DF.PRODUCTIONDATAID=PD.PRODUCTIONDATAID AND DF.VALUEFLAG=1
                                   LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND MDF.DEFECTTYPEID=1
                                   LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
                                   LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
@@ -88,7 +88,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                   LEFT JOIN TP_PC_GROUTINGLINE GDL ON GDL.GROUTINGLINEID=gd.GROUTINGLINEID
                                   LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
                                 WHERE
-	                                PD.PROCEDUREID IN ( 16) 
+	                                PD.PROCEDUREID IN (16)  
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ ".Replace("{DEFECT}",defect);
                 if (context.Request["linecodeMaster"] != null && context.Request["linecodeMaster"] != "") { //判断首个下拉框是否有值

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -36,7 +36,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=4  ORDER BY  MDF.DEFECTCODE
+															where DEFECTTYPEID=4 or  MDF.DEFECTCODE='20' 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=4  ORDER BY  MDF.DEFECTCODE ");
+															where DEFECTTYPEID=4 or  MDF.DEFECTCODE='20' 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();
@@ -105,7 +105,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 
-												 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTCODE = MDF.DEFECTCODE AND MDF.DEFECTTYPEID =4
+												 LEFT JOIN TP_MST_DEFECT MDF ON DF.DEFECTCODE = MDF.DEFECTCODE AND MDF.DEFECTTYPEID =4 or  MDF.DEFECTCODE='20'
 												 WHERE
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt206/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=5 ORDER BY  MDF.DEFECTCODE
+															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20' 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=5 ORDER BY  MDF.DEFECTCODE");
+															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20' 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();
@@ -77,7 +77,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													SELECT  DISTINCT 		 MDF.DEFECTID
 															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
 															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (22) )
+															WHERE jobs.JOBSID IN (22)or  MDF.DEFECTCODE='20' )
                                 WHERE
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -75,7 +75,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LG.LOGONAME AS 商标,
                                         	PD.BARCODE 出窑条码,
                                         	DF.BARCODE 缺陷条码,
-                                        	DF.DEFECTID 缺陷ID
+                                        	DF.DEFECTID 缺陷ID,
+                                        	 MDF.DEFECTTYPEID 缺陷类别
                                         					 
                                         FROM
                                         	TP_PM_PRODUCTIONDATA PD
@@ -130,7 +131,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	GD.GOODSSPECIFICATION ,
                                         	MD.DICTIONARYVALUE ,
                                         	LG.LOGONAME ,
-                                        	PD.BARCODE ,
+                                        	PD.BARCODE ,MDF.DEFECTTYPEID,
                                         	DF.BARCODE ,DF.DEFECTID
                                         )
                                SELECT * FROM(             
@@ -148,7 +149,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         基础数据.釉色,
                                         基础数据.商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 缺陷条码)) 缺陷量,
+                                        TO_CHAR(COUNT( DISTINCT CASE WHEN  缺陷类别 =1  THEN 缺陷条码 ELSE NULL END )) 缺陷量,
                                         TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -35,7 +35,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=4 ORDER BY  MDF.DEFECTID" );//半检获取 成型全部缺陷
+															where DEFECTTYPEID=4 or  MDF.DEFECTCODE='20' ORDER BY  MDF.DEFECTID" );//半检获取 成型全部缺陷
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -47,7 +47,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            'TO_CHAR(SUM( CASE WHEN MDF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
                            	FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=4 ORDER BY  MDF.DEFECTID");
+															where DEFECTTYPEID=4 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();
@@ -85,7 +85,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	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 )
+															where DEFECTTYPEID=4 or  MDF.DEFECTCODE='20')
 											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

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -91,12 +91,7 @@
                 //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
                 headers.push(fields[i]);
             }
-
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(施釉工个人质量分析报表（施釉车间）).xls',
-                workSheet: '施釉工个人质量分析报表（施釉车间）'
-            });
+            $.dataGridToExcel(["DataGridMaster"], ["施釉工个人质量分析报表（施釉车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(施釉工个人质量分析报表（施釉车间）).xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -35,7 +35,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
 															FROM TP_MST_DEFECT MDF
-															where DEFECTTYPEID=5 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 += ",";
@@ -48,7 +48,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                         '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 ORDER BY  MDF.DEFECTID");
+															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();
@@ -85,7 +85,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	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=5 )
+															where DEFECTTYPEID=5 or  MDF.DEFECTCODE='20'or  MDF.DEFECTCODE='20')
 											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 

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -87,16 +87,13 @@
             //加载表头
             var fields = $('#DataGridMaster').datagrid('getColumnFields');
             var headers = [];
+            var fileName = '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(擦坯工个人质量分析报表（施釉车间）).xls';
             for (var i = 0; i < fields.length; i++) {
                 //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
                 headers.push(fields[i]);
             }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(擦坯工个人质量分析报表（施釉车间）).xls',
-                workSheet: '擦坯工个人质量分析报表（施釉车间）'
-            });
+            $.dataGridToExcel(["DataGridMaster"], ["擦坯工个人质量分析报表（施釉车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(擦坯工个人质量分析报表（施釉车间）).xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -88,12 +88,7 @@
                 //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
                 headers.push(fields[i]);
             }
-
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(装窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: ' 装窑工个人质量分析报表（烧成车间）'
-            });
+            $.dataGridToExcel(["DataGridMaster"], ["装窑工个人质量分析报表（烧成车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(装窑工个人质量分析报表（烧成车间）).xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt303/rpt.ashx

@@ -60,7 +60,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 TO_CHAR(count(DISTINCT case when DFC.DEFECTTYPEID NOT IN (1,4,6,7,8,2,3,59,10) AND DF.VALUEFLAG=1 THEN p.BARCODE ELSE NULL END  ))其他缺陷
                                 FROM TP_PM_PRODUCTIONDATA p
 																INNER JOIN TP_PM_GROUTINGDAILYDETAIL gd on gd.BARCODE=p.BARCODE
-                                LEFT JOIN TP_PM_DEFECT df on  df.BARCODE=p.BARCODE
+                                LEFT JOIN TP_PM_DEFECT df on  df.PRODUCTIONDATAID=p.PRODUCTIONDATAID
                                 LEFT JOIN TP_MST_DEFECT DFC ON DFC.DEFECTID=DF.DEFECTID
 																WHERE P.CREATETIME >=@DATEBEGIN@
 																AND P.CREATETIME <=@DATEEND@

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -30,21 +30,21 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									CASE WHEN  gd.GOODSCODE IS NULL THEN  '总计' ELSE TO_CHAR( gd.GOODSCODE )  END GOODSCODE,
 									gds.GOODSSPECIFICATION,
 									gd.GOODSNAME,
-									SUM( CASE WHEN df.DEFECTCODE IN ('01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27','28', '29', '30', '31', '32', '33', '34') THEN 1 ELSE 0 END ) AS 成型半检缺陷__缺陷汇总,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN  MDF.DEFECTTYPEID= 1  THEN DF.BARCODE ELSE NULL END )) AS 成型半检缺陷__缺陷汇总,
 									
 									SUM( CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN 1 ELSE 0 END ) AS 精修缺陷_打磨缺陷_缺陷汇总,
 									
 									SUM( CASE WHEN df.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN 1 ELSE 0 END ) AS 精修缺陷_刷洗缺陷_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '36', '37', '38', '39', '40', '41', '42', '43', '44') THEN 1 ELSE 0 END ) AS 施釉擦坯缺陷_施釉缺陷_缺陷汇总,
+									SUM( CASE WHEN  MDF.DEFECTTYPEID = 4 THEN 1 ELSE 0 END ) AS 施釉擦坯缺陷_施釉缺陷_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '47', '48', '49', '50', '51', '52', '53', '54', '55', '56', '20', '57' ) THEN 1 ELSE 0 END ) AS 施釉擦坯缺陷_擦坯缺陷_缺陷汇总,
+									SUM( CASE WHEN  MDF.DEFECTTYPEID = 5 THEN 1 ELSE 0 END ) AS 施釉擦坯缺陷_擦坯缺陷_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ('61', '62', '63', '64', '65', '66', '67') THEN 1 ELSE 0 END ) AS 烧成缺陷_装窑缺陷_缺陷汇总,
+									SUM( CASE WHEN  MDF.DEFECTTYPEID = 6 THEN 1 ELSE 0 END ) AS 烧成缺陷_装窑缺陷_缺陷汇总,
 									
-									SUM(CASE   WHEN df.DEFECTCODE IN ('69', '70', '71', '43', '73', '74', '75', '76', '77', '78', '79', '80' ) THEN 1 ELSE 0  END ) AS 烧成缺陷_烧窑缺陷_缺陷汇总,
+									SUM(CASE  WHEN  MDF.DEFECTTYPEID = 7 THEN 1 ELSE 0  END ) AS 烧成缺陷_烧窑缺陷_缺陷汇总,
 									
-									SUM( CASE WHEN df.DEFECTCODE IN ( '83', '84' ) THEN 1 ELSE 0 END ) AS 烧成缺陷_出窑缺陷_缺陷汇总,
+									SUM( CASE WHEN MDF.DEFECTTYPEID = 8 THEN 1 ELSE 0 END ) AS 烧成缺陷_出窑缺陷_缺陷汇总,
 									
 									SUM( CASE WHEN df.DEFECTCODE IN ( '86', '87','086', '88'  ) THEN 1 ELSE 0 END ) AS 原料缺陷_缺陷汇总,
 									
@@ -63,13 +63,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									SUM( CASE WHEN df.DEFECTCODE IN ( '99', '100', '099', '0100' ) THEN 1 ELSE 0 END ) AS 其他_缺陷汇总
 									
 									
-											FROM
-												TP_PM_DEFECT df
+											FROM TP_PM_PRODUCTIONDATA PD
+											LEFT JOIN TP_PM_DEFECT df ON PD.PRODUCTIONDATAID=DF.PRODUCTIONDATAID 
 												LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON  df.BARCODE = gd.BARCODE 
 												LEFT JOIN TP_MST_GOODS gds ON gds.GOODSCODE=gd.GOODSCODE
+												LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1  
 												
 											WHERE
-												df.VALUEFLAG = 1 
+												df.VALUEFLAG = 1 AND PD.PROCEDUREID=16 AND PD.VALUEFLAG=1 
 												AND df.CREATETIME >= @DATEBEGIN@ 
 												AND df.CREATETIME < @DATEEND@ 
 											GROUP BY

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -68,7 +68,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 pd.PROCEDUREID AS  PROCEDUREID
                                                 FROM
                                                 TP_PM_PRODUCTIONDATA pd
-                                                LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
+                                                LEFT JOIN TP_PM_DEFECT df ON DF.PRODUCTIONDATAID=PD.PRODUCTIONDATAID 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
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID