ztl 2 жил өмнө
parent
commit
fdce7f863a

+ 42 - 42
wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -97,8 +97,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                         注浆数 AS
                         (
                         SELECT
-						GROUPING_ID (TO_CHAR(GH.CREATETIME, 'YYYYMMDD')) AS GID,
-						NVL(TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),'合计') AS 时间,
+						GROUPING_ID (TO_CHAR(GH.CREATETIME, 'YYYYMM')) AS GID,
+						NVL(TO_CHAR(GH.CREATETIME, 'YYYYMM'),'合计') AS 时间,
             SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
                   AND INSTR(GT.GOODSTYPECODE, '001002') = 1 AND GH.DATATYPE = 1 THEN 1 ELSE 
 								 CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
@@ -132,13 +132,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			{TESTFLAG}
         AND GH.DATATYPE IN (1, 2)
         AND G.SCRAPSUMFLAG = '1'
-      GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),())
+      GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMM'),())
  ),
  成型报损 AS
  (
 				SELECT
-						GROUPING_ID (TO_CHAR(GH.CREATETIME, 'YYYYMMDD')) AS GID,
-						NVL(TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),'合计') AS 时间,
+						GROUPING_ID (TO_CHAR(GH.CREATETIME, 'YYYYMM')) AS GID,
+						NVL(TO_CHAR(GH.CREATETIME, 'YYYYMM'),'合计') AS 时间,
             SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
                   AND INSTR(GT.GOODSTYPECODE, '001002') = 1 AND GH.DATATYPE = 3 THEN 1 ELSE 
 								 CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
@@ -169,7 +169,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			{TESTFLAG}
 			AND GH.DATATYPE IN ( 3, 4 ) 
 			AND G.SCRAPSUMFLAG = '1' 
-      GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMMDD'),())
+      GROUP BY GROUPING SETS (TO_CHAR(GH.CREATETIME, 'YYYYMM'),())
  ),
  半检不合格 AS
  (
@@ -189,7 +189,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
 						    END ) 三车间,
-						TO_CHAR(SP.AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(SP.AUDITDATE, 'YYYYMM') 时间
 				FROM
 					TP_PM_SCRAPPRODUCT SP
 					INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -210,7 +210,7 @@ SELECT
 			{TESTMOULDFLAG}
 			{TESTFLAG}
 					AND SP.SCRAPTYPE IN (2)
-					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
+					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMM')
 					UNION ALL-- 工序报损撤销
 				SELECT
 					SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
@@ -221,7 +221,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN -1 ELSE 0
 						    END ) 三车间,
-								TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD') 时间
+								TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') 时间
 						FROM
 							TP_PM_SCRAPPRODUCT SP
 							INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -243,7 +243,7 @@ SELECT
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
 							{TESTFLAG}
-							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')
+							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMM')
 							--  AND SP.SCRAPTYPE IN (0, 2, 3)
 							UNION ALL
 							-- 干补报损
@@ -252,7 +252,7 @@ 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) 三车间,
-						TO_CHAR(AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(AUDITDATE, 'YYYYMM') 时间
 							--COUNT( * ) SCRAPNUM
 						FROM
 							(
@@ -323,7 +323,7 @@ SELECT
 										INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID
 										INNER JOIN TP_MST_GOODS G ON G.GOODSID = PD.GOODSID
 										INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID 
-									) GROUP BY TO_CHAR(AUDITDATE, 'YYYYMMDD') )T GROUP BY
+									) GROUP BY TO_CHAR(AUDITDATE, 'YYYYMM') )T GROUP BY
 		GROUPING SETS ( T.时间, ( ) )
  ),
 复检不合格 AS 
@@ -344,7 +344,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
 						    END ) 三车间,
-						TO_CHAR(SP.AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(SP.AUDITDATE, 'YYYYMM') 时间
 				FROM
 					TP_PM_SCRAPPRODUCT SP
 					INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -365,7 +365,7 @@ SELECT
 					{TESTMOULDFLAG}
 					{TESTFLAG}
 					AND SP.SCRAPTYPE IN (3)
-					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
+					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMM')
 					UNION ALL-- 工序报损撤销
 				SELECT
 					SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
@@ -376,7 +376,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN -1 ELSE 0
 						    END ) 三车间,
-								TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD') 时间
+								TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') 时间
 						FROM
 							TP_PM_SCRAPPRODUCT SP
 							INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -398,7 +398,7 @@ SELECT
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
 							{TESTFLAG}
-							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')
+							GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMM')
 							--  AND SP.SCRAPTYPE IN (0, 2, 3)
 							 UNION ALL
 							-- 干补报损
@@ -407,7 +407,7 @@ 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) 三车间,
-						TO_CHAR(AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(AUDITDATE, 'YYYYMM') 时间
 						FROM
 							(
 							SELECT
@@ -477,7 +477,7 @@ SELECT
 										INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID
 										INNER JOIN TP_MST_GOODS G ON G.GOODSID = PD.GOODSID
 										INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID 
-									) GROUP BY TO_CHAR(AUDITDATE, 'YYYYMMDD')
+									) GROUP BY TO_CHAR(AUDITDATE, 'YYYYMM')
 									)T GROUP BY
 		GROUPING SETS ( T.时间, ( ) )
  ),
@@ -499,7 +499,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
 						    END ) 三车间,
-						TO_CHAR(SP.AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(SP.AUDITDATE, 'YYYYMM') 时间
 				FROM
 					TP_PM_SCRAPPRODUCT SP
 					INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -520,7 +520,7 @@ SELECT
 							{TESTMOULDFLAG}
 							{TESTFLAG}
 					AND SP.SCRAPTYPE IN (0)
-					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')
+					GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMM')
 					UNION ALL-- 工序报损撤销
 				SELECT
 					SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
@@ -531,7 +531,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN -1 ELSE 0
 						    END ) 三车间,
-								TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD') 时间
+								TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') 时间
 						FROM
 							TP_PM_SCRAPPRODUCT SP
 							INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( 20,30,40 ) 
@@ -552,14 +552,14 @@ SELECT
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							{TESTMOULDFLAG}
 							{TESTFLAG}
-						GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD') UNION ALL
+						GROUP BY TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') UNION ALL
 							-- 干补报损
 ---------------------------------------------------
 						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) 三车间,
-						TO_CHAR(AUDITDATE, 'YYYYMMDD') 时间
+						TO_CHAR(AUDITDATE, 'YYYYMM') 时间
 						FROM
 							(
 							SELECT
@@ -629,7 +629,7 @@ SELECT
 										INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID
 										INNER JOIN TP_MST_GOODS G ON G.GOODSID = PD.GOODSID
 										INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID 
-									)  GROUP BY TO_CHAR(AUDITDATE, 'YYYYMMDD')
+									)  GROUP BY TO_CHAR(AUDITDATE, 'YYYYMM')
 									)T GROUP BY
 		GROUPING SETS ( T.时间, ( ) )
  ),
@@ -651,7 +651,7 @@ SELECT
 								END ) AS 二车间,
             SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
 						    END ) 三车间,
-						TO_CHAR(SP.SPECIALREPAIRTIME, 'YYYYMMDD') 时间
+						TO_CHAR(SP.SPECIALREPAIRTIME, 'YYYYMM') 时间
 			FROM
 				TP_PM_SCRAPPRODUCT SP
 				INNER JOIN TSAP_HEGII_DATAITEM HGDI ON HGDI.DATACODE IN ( '20', '30', '40' ) 
@@ -671,7 +671,7 @@ SELECT
 				AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 				{TESTMOULDFLAG}
 				{TESTFLAG}
-			GROUP BY TO_CHAR(SP.SPECIALREPAIRTIME, 'YYYYMMDD'))T GROUP BY
+			GROUP BY TO_CHAR(SP.SPECIALREPAIRTIME, 'YYYYMM'))T GROUP BY
 		GROUPING SETS ( T.时间, ( ) )
  ),
  出窑数 AS
@@ -684,7 +684,7 @@ SELECT
 					SUM(TT2.出窑数_三部全部) 出窑数_三部全部
 					FROM(
  									SELECT
-										TO_CHAR(TT.CREATETIME, 'YYYYMMDD') AS 时间,
+										TO_CHAR(TT.CREATETIME, 'YYYYMM') AS 时间,
 										SUM(CASE WHEN TT.WORKSHOP = 1 THEN 1 ELSE 0 END) 出窑数_一部全部,
 										SUM(CASE WHEN TT.WORKSHOP = 2 THEN 1 ELSE 0 END) 出窑数_二部全部,
 										SUM(CASE WHEN TT.WORKSHOP = 3 THEN 1 ELSE 0 END) 出窑数_三部全部
@@ -743,7 +743,7 @@ SELECT
                                         --    PD.CHECKFLAG = '1'))) T
                                          AND ((HGDI.ITEMID = 11 AND (PD.CHECKFLAG = '1' OR PD.CHECKFLAG IS NULL)) 
                                           OR (HGDI.ITEMID = 104 AND PD.CHECKFLAG = '1')) ) T )TT
-                     GROUP BY TO_CHAR(TT.CREATETIME, 'YYYYMMDD') )TT2 GROUP BY
+                     GROUP BY TO_CHAR(TT.CREATETIME, 'YYYYMM') )TT2 GROUP BY
 		GROUPING SETS ( TT2.时间, ( ) )
  ),
  回收数 AS
@@ -807,7 +807,7 @@ SELECT BAR.GOODSCODE,
                                        ELSE
                                         0
                                    END AS WORKSHOP,
-                                   TO_CHAR(GH.FHTIME, 'YYYYMMDD') AS CHARG
+                                   TO_CHAR(GH.FHTIME, 'YYYYMM') AS CHARG
                               FROM TP_PM_GROUTINGDAILYDETAIL BAR
                              INNER JOIN TP_PM_FINISHEDPRODUCT GH
                                 ON BAR.GROUTINGDAILYDETAILID = GH.GROUTINGDAILYDETAILID
@@ -891,7 +891,7 @@ SELECT BAR.GOODSCODE,
                                        ELSE
                                         0
                                    END AS WORKSHOP,
-                                   TO_CHAR(GH.FHTIME, 'YYYYMMDD') AS CHARG
+                                   TO_CHAR(GH.FHTIME, 'YYYYMM') AS CHARG
                               FROM TP_PM_GROUTINGDAILYDETAIL BAR
                              INNER JOIN TP_PM_FINISHEDPRODUCT GH
                                 ON BAR.GROUTINGDAILYDETAILID = GH.GROUTINGDAILYDETAILID
@@ -963,7 +963,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1044,7 +1044,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.BACKOUTTIME, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1121,7 +1121,7 @@ SELECT GOODSCODE,
                                     END AS WORKSHOP,
                                     DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                     G.GOODS_LINE_CODE,
-                                    TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG
+                                    TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG
                                     --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG
                                FROM (SELECT T.*
                                        FROM (SELECT SP.BARCODE,
@@ -1226,7 +1226,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1307,7 +1307,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1384,7 +1384,7 @@ SELECT GOODSCODE,
                                     END AS WORKSHOP,
                                     DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                     G.GOODS_LINE_CODE,
-                                    TO_CHAR(SP.AUDITDATE, 'YYYYMMDD') AS CHARG
+                                    TO_CHAR(SP.AUDITDATE, 'YYYYMM') AS CHARG
                                     --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG
                                FROM (SELECT T.*
                                        FROM (SELECT SP.BARCODE,
@@ -1492,7 +1492,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1573,7 +1573,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.BACKOUTTIME, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.BACKOUTTIME, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1650,7 +1650,7 @@ SELECT GOODSCODE,
                                     END AS WORKSHOP,
                                     DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                     G.GOODS_LINE_CODE,
-                                    TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG
+                                    TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG
                                     --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG
                                FROM (SELECT T.*
                                        FROM (SELECT SP.BARCODE,
@@ -1757,7 +1757,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1838,7 +1838,7 @@ SELECT GOODSCODE,
                                             GT.GOODSTYPECODE,
                                             DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                             G.GOODS_LINE_CODE,
-                                            TO_CHAR(SP.AUDITDATE, 'YYYYMMDD')  AS CHARG,
+                                            TO_CHAR(SP.AUDITDATE, 'YYYYMM')  AS CHARG,
                                             --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
                                             HGDI.WORKSHOP AS HGDIWORKSHOP,
                                             -- 如果参与了重烧,则判断这个条码是否走过3#卸窑
@@ -1915,7 +1915,7 @@ SELECT GOODSCODE,
                                     END AS WORKSHOP,
                                     DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
                                     G.GOODS_LINE_CODE,
-                                    TO_CHAR(SP.AUDITDATE, 'YYYYMMDD') AS CHARG
+                                    TO_CHAR(SP.AUDITDATE, 'YYYYMM') AS CHARG
                                     --TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG
                                FROM (SELECT T.*
                                        FROM (SELECT SP.BARCODE,