修改缺陷对应到 缺陷类别

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -35,10 +35,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||MDF.DEFECTCODE||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-                            FROM
-	                            TP_MST_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(10,37,41) ORDER BY  MDF.DEFECTCODE
+                             	FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=4  ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -50,10 +48,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            DISTINCT MDF.DEFECTCODE AS DFCODE,
 	                            'TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-                            FROM
-	                            TP_MST_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(10,37,41) ORDER BY  MDF.DEFECTCODE ");
+                           FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=4  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();

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -36,9 +36,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                                                                              ELSE
                                                                                                     TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||MDF.DEFECTCODE||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                                                                                            MDF.DEFECTNAME  	
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (22) ORDER BY  MDF.DEFECTCODE
+															FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=5 ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -49,9 +48,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
               DataTable dts = conn.ExecuteDatatable(@"SELECT DISTINCT MDF.DEFECTCODE AS DC,
                                                         'TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
-													FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (22) ORDER BY  MDF.DEFECTCODE");
+												FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=5 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();

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -35,10 +35,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||MDF.DEFECTCODE||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-                            FROM
-	                            TP_MST_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(55,13) ORDER BY  MDF.DEFECTCODE
+                          FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=6 ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -50,9 +48,8 @@ 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_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(55,13) ORDER BY  MDF.DEFECTCODE");
+	                          FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=6  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();

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -36,10 +36,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||MDF.DEFECTCODE||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-                            FROM
-	                            TP_MST_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(39,57) ORDER BY  MDF.DEFECTCODE
+                            FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -50,10 +48,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
               DataTable dts = conn.ExecuteDatatable(@"SELECT DISTINCT MDF.DEFECTCODE AS DC,
                                                         'TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
-	                             FROM
-	                            TP_MST_INHERITANCEDEFECTS MDF 
-                            WHERE
-	                            DEFECTPROCEDUREID IN(39,57) ORDER BY  MDF.DEFECTCODE");
+	                         FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=7 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();

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -34,9 +34,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (10) ORDER BY  MDF.DEFECTID");
+															FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTID");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -48,9 +47,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															 MDF.DEFECTID,
                                                         'TO_CHAR(SUM( CASE WHEN MDF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
-	                            FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (10) ORDER BY  MDF.DEFECTID");
+	                            FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=7 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();
@@ -83,9 +81,8 @@ 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_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (10))
+															FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=7 ORDER BY  MDF.DEFECTID)
 											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

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -34,9 +34,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (11) ORDER BY  MDF.DEFECTID");
+												 FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=8 ORDER BY  MDF.DEFECTID");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
 					if (i > 0) defect += ",";
@@ -48,9 +47,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															 MDF.DEFECTID,
                                                         'TO_CHAR(SUM( CASE WHEN MDF.DEFECTCODE = '''||DEFECTCODE||''' THEN 1 ELSE 0 END ))' AS DEFECTCODE,
 	                                                   MDF.DEFECTNAME 
-                            FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (11) ORDER BY  MDF.DEFECTID");
+                            FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=8 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();
@@ -84,9 +82,8 @@ 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_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (11) )
+															 FROM TP_MST_DEFECT MDF
+															where DEFECTTYPEID=8 )
 											INNER JOIN TP_PM_PRODUCTIONDATA PDC ON PDC.BARCODE=GDL.BARCODE AND PDC.PROCEDUREID IN (14,26,56) 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
@@ -96,7 +93,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
                                         	AND PD.VALUEFLAG = 1
-																					GROUP BY  PD.BARCODE,
+											GROUP BY  PD.BARCODE,
                                         	GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME  ,GD.GOODSCODE,