次品区看板调整简称

wwwroot/main/Procedure/test5/rpt.ashx

@@ -39,7 +39,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			                (
 			                SELECT
 				                D.DEFECTCODE,
-				                D.DEFECTNAME,
+				                DEFECT.S_NAME AS DEFECTNAME,
 				                COUNT( DISTINCT D.BARCODE ) AS NUM 
 			                FROM
 				                TP_PM_DEFECT D
@@ -50,6 +50,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								INNER JOIN TP_MST_DEFECTFINE DF ON DF.DEFECTFINEID = DFR.DEFECTFINEID  
 								INNER JOIN TP_MST_DEFECTDEDUCTIONRELATION DDR ON D.DEFECTID = DDR.DEFECTID  
 								INNER JOIN TP_MST_DEFECTDEDUCTION DD ON DD.DEFECTDEDUCTIONID = DDR.DEFECTDEDUCTIONID  
+								INNER JOIN TP_MST_DEFECT DEFECT ON D.DEFECTID = DEFECT.DEFECTID
 			                WHERE
 				                D.VALUEFLAG = 1 
 				                AND PD.VALUEFLAG = 1 
@@ -61,7 +62,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND INSTR (PD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( PD.GROUTINGLINECODE, 'A' ) = 4 
 			                GROUP BY
 				                D.DEFECTCODE,
-				                D.DEFECTNAME 
+				                DEFECT.S_NAME
 			                ) 
 		                ) 
 	                WHERE
@@ -109,7 +110,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												m.NUM as n,
 				                M.RN,
 				                D.DEFECTPOSITIONCODE,
-				                D.DEFECTPOSITIONNAME,
+				                DEFECTPOSITION.S_NAME AS DEFECTPOSITIONNAME,
 				                COUNT( DISTINCT D.BARCODE ) AS NUM 
 			                FROM
 				                MES M
@@ -117,6 +118,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_MST_GOODS G ON D.GOODSID = G.GOODSID
 								LEFT JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 				                LEFT JOIN TP_PM_PRODUCTIONDATA PD ON D.PRODUCTIONDATAID = PD.PRODUCTIONDATAID 
+								INNER JOIN TP_MST_DEFECTPOSITION DEFECTPOSITION  ON DEFECTPOSITION .DEFECTPOSITIONID = D.DEFECTPOSITIONID
 			                WHERE
 				                D.VALUEFLAG = 1 
 				                AND PD.VALUEFLAG = 1 
@@ -132,7 +134,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												m.num,
 				                M.RN,
 				                D.DEFECTPOSITIONCODE,
-				                D.DEFECTPOSITIONNAME 
+				                DEFECTPOSITION.S_NAME 
 			                ) 
 		                ) 
 	                WHERE
@@ -271,15 +273,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					(
 					SELECT
 						D.DEFECTCODE AS DC,
-						D.DEFECTNAME AS DN -- ,s.GOODSLEVELTYPEID
-						,
+						DEFECT.S_NAME AS DN,
+						-- ,s.GOODSLEVELTYPEID
 						DOL.OFFICENAME,
 						COUNT( DISTINCT S.BARCODE ) AS NM,
 						ROW_NUMBER ( ) OVER ( ORDER BY COUNT( DISTINCT S.BARCODE ) DESC ) AS RN 
 					FROM
 						TP_PM_SCRAPPRODUCT S
 						INNER JOIN TP_PM_DEFECT D ON S.BARCODE = D.BARCODE 
-						INNER JOIN TP_DSB_DEFECTOFFICELINKED DOL ON DOL.DEFECTCODE = D.DEFECTCODE 					
+						INNER JOIN TP_DSB_DEFECTOFFICELINKED DOL ON DOL.DEFECTCODE = D.DEFECTCODE 	
+						INNER JOIN TP_MST_DEFECT DEFECT ON D.DEFECTID = DEFECT.DEFECTID
 					WHERE
 						S.VALUEFLAG = 1 
 						AND S.GOODSLEVELTYPEID IN ( 7 ) 
@@ -290,9 +293,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						AND S.ISREFIRE = 0 
 						AND S.CREATETIME >= TRUNC( SYSDATE ) + 7/24
 					GROUP BY
-												DOL.OFFICENAME,
-												D.DEFECTCODE,
-						D.DEFECTNAME 
+						DOL.OFFICENAME,
+						D.DEFECTCODE,
+						DEFECT.S_NAME 
 					) 
 -- 				WHERE
 -- 					RN < 11
@@ -348,7 +351,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					D.GOODSCODE,
 					D.DEFECTCODE,
 				-- D.DEFECTNAME||'('||D.DEFECTCODE||')' DEFECTNAME,
-					D.DEFECTNAME || '_' || DOL.OFFICENAME DEFECTNAME,
+					DEFECT.S_NAME || '_' || DOL.OFFICENAME DEFECTNAME,
 				-- D.DEFECTNAME,
 					COUNT( DISTINCT D.BARCODE ) AS NUM,
 					ROUND( 100 * RATIO_TO_REPORT ( COUNT( DISTINCT D.BARCODE ) ) OVER ( PARTITION BY 1 ), 1 ) || '%' AS PERCENTAGE 
@@ -357,7 +360,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					LEFT JOIN TP_MST_GOODS G ON D.GOODSID = G.GOODSID
 					LEFT JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 					INNER JOIN TP_PM_PRODUCTIONDATA PD ON D.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
-					INNER JOIN TP_DSB_DEFECTOFFICELINKED DOL ON DOL.DEFECTCODE = D.DEFECTCODE 		
+					INNER JOIN TP_DSB_DEFECTOFFICELINKED DOL ON DOL.DEFECTCODE = D.DEFECTCODE 	
+					INNER JOIN TP_MST_DEFECT DEFECT ON D.DEFECTID = DEFECT.DEFECTID	
 				WHERE
 					D.VALUEFLAG = 1 
 					AND PD.VALUEFLAG = 1 
@@ -372,7 +376,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					DOL.OFFICENAME,
 					D.GOODSCODE,
 					D.DEFECTCODE,
-					D.DEFECTNAME 
+					DEFECT.S_NAME
 				ORDER BY
 					NUM DESC
                 ";