新报工报表修改，车间取数问题

wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -490,13 +490,15 @@ SUM(T.二车间) 半成品损坯数_二部全部,
 SUM(T.三车间) 半成品损坯数_三部全部
 FROM(
 SELECT
-			SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
-                  AND INSTR(GT.GOODSTYPECODE, '001002') = 1  THEN 1 ELSE 0
+			SUM( CASE WHEN HGDI.WORKSHOP = 2
+                                             AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN
+                                         1 ELSE 0
 								 END) AS 一车间,
- 					  SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'B') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
-								AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN 1 ELSE 0
+ 					  SUM(CASE WHEN HGDI.WORKSHOP = 2
+                                             AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN
+                                         1 ELSE 0
 								END ) AS 二车间,
-            SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
+            SUM(CASE WHEN HGDI.WORKSHOP = 3 THEN   1 ELSE 0
 						    END ) 三车间,
 						TO_CHAR(SP.AUDITDATE, 'YYYYMM') 时间
 				FROM
@@ -522,13 +524,15 @@ SELECT
 					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMM')
 					UNION ALL-- 工序报损撤销
 				SELECT
-					SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
-                  AND INSTR(GT.GOODSTYPECODE, '001002') = 1  THEN -1 ELSE 0
+					SUM( CASE WHEN HGDI.WORKSHOP = 2
+                                             AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN
+                                         -1 ELSE 0
 								 END) AS 一车间,
- 					  SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'B') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
-								AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN -1 ELSE 0
+ 					  SUM(CASE WHEN HGDI.WORKSHOP = 2
+                                             AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN
+                                         -1 ELSE 0
 								END ) AS 二车间,
-            SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN -1 ELSE 0
+            SUM(CASE WHEN HGDI.WORKSHOP = 3 THEN   -1 ELSE 0
 						    END ) 三车间,
 								TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') 时间
 						FROM
@@ -555,9 +559,9 @@ SELECT
 							-- 干补报损
 ---------------------------------------------------
 						SELECT
-						COUNT(CASE WHEN WORKSHOP = 1 THEN 1 ELSE 0 END) 一车间,
-						COUNT(CASE WHEN WORKSHOP = 2 THEN 1 ELSE 0 END) 二车间,
-						COUNT(CASE WHEN WORKSHOP = 3 THEN 1 ELSE 0 END) 三车间,
+						SUM(CASE WHEN WORKSHOP = 1 THEN 1 ELSE 0 END) 一车间,
+						SUM(CASE WHEN WORKSHOP = 2 THEN 1 ELSE 0 END) 二车间,
+						SUM(CASE WHEN WORKSHOP = 3 THEN 1 ELSE 0 END) 三车间,
 						TO_CHAR(AUDITDATE, 'YYYYMM') 时间
 						FROM
 							(