商标查询条件改为多选

wwwroot/mes/rpt/rpt135/rpt.ashx

@@ -33,6 +33,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //主表
                 if (context.Request["n"].ToString() == "0")
                 {
+                    string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
+                    string logoIds = context.Request["LOGONAME[]"] is object ? context.Request["LOGONAME[]"].ToString() : "";
+                    logoId = logoId==""?logoIds==""?"":" AND gdd.logoid in ("+logoIds+")":" AND gdd.logoid in ("+logoId+")";
+
                     //读取报表数据
                     string sqlStr = @"
                      SELECT
@@ -76,10 +80,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND gdd.delivertime >=  @datebegin@
 								AND gdd.delivertime <  @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
-								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
-                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
+								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)"+logoId;
 
-							GROUP BY
+                    sqlStr+=  @"  GROUP BY
 								gdd.goodsid 
 							UNION ALL-- 干补数
 							SELECT
@@ -97,9 +100,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND p.createtime >= @datebegin@
 								AND p.createtime < @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
-								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
-                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
-							GROUP BY
+								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)"+logoId; 
+							sqlStr+=  @" GROUP BY
 								p.goodsid 
 							UNION ALL-- 半检不合格数  复检不合格数  损坯数
 							SELECT
@@ -119,9 +121,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND sp.AUDITDATE >= @datebegin@
 								AND sp.AUDITDATE < @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
-								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
-                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
-							GROUP BY
+								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)"+logoId; 
+							sqlStr+=  @" GROUP BY
 								sp.goodsid,
 								sp.SCRAPTYPE 
 							) t 
@@ -138,8 +139,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                         sqlPara.Add(new CDAParameter("goodscode", context.Request["goodscode"]));
                     }
                     sqlStr += " order by g.goodscode";
+
                     sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["workshopcodeMaster"].ToString()));
-                    sqlPara.Add(new CDAParameter("LOGOID", context.Request["LOGONAME"].ToString()));
                     sqlPara.Add(new CDAParameter("HIGHPRESSUREFLAG", context.Request["HIGHPRESSUREFLAG"]));
                     sqlPara.Add(new CDAParameter("goodstypecode", context.Request["goodstypecode"].ToString()));
                     //直接获取不分页数据
@@ -150,6 +151,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //子表
                 if (context.Request["n"].ToString() == "1")
                 {
+                    string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
+                    string logoIds = context.Request["LOGONAME[]"] is object ? context.Request["LOGONAME[]"].ToString() : "";
+                    logoId = logoId==""?logoIds==""?"":" AND gdd.logoid in ("+logoIds+")":" AND gdd.logoid in ("+logoId+")";
+
                     string sqlStr = "WITH ppp_details AS (  " +
                         "select  TO_CHAR(g.goodscode) 产品编码\n" +
                    "          ,ppp.b_out_num 本烧出窑数\n" +
@@ -178,8 +183,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                    "         and p.procedureid in (11, 58, 104)\n" +
                    "         and p.createtime >= @datebegin@\n" +
                    "         and p.createtime <  @dateend@\n" +
-                   "		AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0) " +
-                   "		AND (@LOGOID@ IS NULL OR instr(gdd.LOGOID , @LOGOID@) > 0) " +
+                   "		AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0) " + logoId +
                    "		AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)" +
                    "        AND (@groutinglineMaster@ IS NULL OR instr(gl.GROUTINGLINEID , @groutinglineMaster@) > 0)" +
                    "		AND (@goodstypecode@ IS NULL OR instr(gt.goodstypecode,@goodstypecode@) = 1)";
@@ -189,37 +193,36 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                         sqlStr += " and instr(p.goodscode,@GOODSCODE@) > 0 \n";
                         sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscode"]));
                     }
-                    sqlStr += @"  GROUP BY 	p.goodsid  
-                                    UNION ALL
-                                    select 	p.goodsid
-                                        ,0 AS OUTflag
-                                        ,0 b_out_num
-                                        ,nvl(sum(case when p.goodsleveltypeid in(6,7) and p.isrefire='0' then 1 else 0 end), 0) b_bad_num -- 本烧不合格数
-                                        ,0 c_out_num
-                                        ,nvl(sum(case when p.goodsleveltypeid in(6,7)and p.isrefire='6' then 1 else 0 end), 0) c_bad_num -- 重烧不合格数
-                                      from (
-			                                select distinct 				p.goodsleveltypeid
-                                                               ,p.barcode
-                                                               ,p.goodsid
-															                                 ,p.ISREFIRE
-                                                  from tp_pm_productiondata p
-                                                 inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = p.groutingdailydetailid
-								                                LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=p.GROUTINGLINEID
-                                                 INNER JOIN TP_PM_DEFECT dfc on dfc.productiondataid=p.productiondataid
-								                                INNER JOIN tp_mst_goods g ON p.goodsid = g.goodsid
-								                                LEFT JOIN TP_MST_GOODSTYPE GT ON g.GOODSTYPEID=GT.GOODSTYPEID
-		                                 where p.accountid = @accountid@
-                                         AND P.VALUEFLAG = 1
-                                         and p.modeltype IN (-1, -4, -5)
-                                         and p.CHECKBATCHNO = 1
-                                         and length(p.kilncarbatchno) > 0
-                                         and p.createtime >= @datebegin@
-                                         and p.createtime <  @dateend@
-				                                AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)   
-				                                AND (@LOGOID@ IS NULL OR instr(gdd.LOGOID , @LOGOID@) > 0)    
-				                                AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)	
-                                                AND (@groutinglineMaster@ IS NULL OR instr(gl.GROUTINGLINEID , @groutinglineMaster@) > 0)
-				                                AND (@goodstypecode@ IS NULL OR instr(gt.goodstypecode,@goodstypecode@) = 1) ";
+                    sqlStr += "  GROUP BY 	p.goodsid \n" +  
+                                  "   UNION ALL\n" +
+                                  "   select 	p.goodsid\n" +
+                                    "     ,0 AS OUTflag\n" +
+                                    "     ,0 b_out_num\n" +
+                                    "     ,nvl(sum(case when p.goodsleveltypeid in(6,7) and p.isrefire='0' then 1 else 0 end), 0) b_bad_num -- 本烧不合格数\n" +
+                                    "     ,0 c_out_num\n" +
+                                    "     ,nvl(sum(case when p.goodsleveltypeid in(6,7)and p.isrefire='6' then 1 else 0 end), 0) c_bad_num -- 重烧不合格数\n" +
+                                    "   from (\n" +
+			                            "     select distinct 				p.goodsleveltypeid\n" +
+                                          "                      ,p.barcode\n" +
+                                          "                      ,p.goodsid\n" +
+										" 					                                 ,p.ISREFIRE\n" +
+                                           "        from tp_pm_productiondata p\n" +
+                                          "        inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = p.groutingdailydetailid\n" +
+								          "                       LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=p.GROUTINGLINEID\n" +
+                                         "         INNER JOIN TP_PM_DEFECT dfc on dfc.productiondataid=p.productiondataid and dfc.barcode = p.barcode\n" +
+								         "                        INNER JOIN tp_mst_goods g ON p.goodsid = g.goodsid\n" +
+								        "                         LEFT JOIN TP_MST_GOODSTYPE GT ON g.GOODSTYPEID=GT.GOODSTYPEID\n" +
+		                                "  where p.accountid = @accountid@ \n" +
+                                        "  and length(p.kilncarbatchno) > 0\n" +
+                                        "  AND P.VALUEFLAG = 1\n" +
+                                        "  and p.CHECKBATCHNO = 1\n" +
+                                        "  and p.modeltype IN (-1, -4, -5)\n" +
+                                        "  and p.createtime >= @datebegin@\n" +
+                                        "  and p.createtime <  @dateend@\n" +
+				                               "  AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)   "+logoId+
+                                                " AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)	"+
+                                                "AND (@groutinglineMaster@ IS NULL OR instr(gl.GROUTINGLINEID , @groutinglineMaster@) > 0)"+
+                                                "AND (@goodstypecode@ IS NULL OR instr(gt.goodstypecode,@goodstypecode@) = 1) ";
                     // 产品编码条件修正 fenglinyong modify 2022-05-10
                     if (!string.IsNullOrWhiteSpace(context.Request["goodscode"] + ""))
                     {
@@ -231,24 +234,27 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     "     inner join tp_mst_goods g\n" +
                     "        on g.goodsid = ppp.goodsid\n" +
                     "     order by g.goodscode) ";
-                        sqlStr += "SELECT * FROM ppp_details\n" +
-                    "UNION ALL\n" +
-                    "SELECT '合计' AS 产品编码," +
-                    "SUM(本烧出窑数) AS 本烧出窑数," +
-                    "SUM(本烧合格数) AS 本烧合格数," +
-                    "SUM(重烧合格数) AS 重烧合格数," +
-                    "ROUND((SUM(本烧合格数) + SUM(重烧合格数)) / NULLIF(SUM(本烧出窑数), 0), 4) * 100 || '%' AS 综合合格率\n " +
-                    "FROM ppp_details ";
+                    sqlStr += "SELECT * FROM ppp_details\n" +
+                "UNION ALL\n" +
+                "SELECT '合计' AS 产品编码," +
+                "SUM(本烧出窑数) AS 本烧出窑数," +
+                "SUM(本烧合格数) AS 本烧合格数," +
+                "SUM(重烧合格数) AS 重烧合格数," +
+                "ROUND((SUM(本烧合格数) + SUM(重烧合格数)) / NULLIF(SUM(本烧出窑数), 0), 4) * 100 || '%' AS 综合合格率\n " +
+                "FROM ppp_details ";
+
+
                     sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["workshopcodeMaster"].ToString()));
-                    sqlPara.Add(new CDAParameter("LOGOID", context.Request["LOGONAME"].ToString()));
                     sqlPara.Add(new CDAParameter("HIGHPRESSUREFLAG", context.Request["HIGHPRESSUREFLAG"]));
                     sqlPara.Add(new CDAParameter("groutinglineMaster", context.Request["groutinglineMaster"]));
                     sqlPara.Add(new CDAParameter("goodstypecode", context.Request["goodstypecode"].ToString()));
 
                     //直接获取不分页数据
-                    JsonResult jsonresult = Easyui.ExecuteJsonResult(conn, sqlStr, sqlPara);
+                    //JsonResult jsonresult = Easyui.ExecuteJsonResult(conn, sqlStr, sqlPara);
 
-                    context.Response.Write(jsonresult.ToJson());
+                    DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                    //context.Response.Write(jsonresult.ToJson());
+                    context.Response.Write(   new JsonResult(dt) { total = dt.Rows.Count }.ToJson());
                 }
             }
         }

wwwroot/mes/rpt/rpt135/rpt_index.html

@@ -34,9 +34,9 @@
                         <input class="easyui-combobox" id="HIGHPRESSUREFLAG" name="HIGHPRESSUREFLAG" data-options="required:false,prompt:'',tipPosition:'top',
                         data:[{'value':'','text':'全部'},{'value':'1','text':'高压'},{'value':'0','text':'普通'}],method:'get',valueField:'value',textField:'text',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;"> &nbsp;
                         <br />成型线号：
-                        <input class="easyui-combobox" id="groutinglineMaster" name="groutinglineMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:true" style="width: 165px; height: 32px;">
+                        <input class="easyui-combobox" id="groutinglineMaster" name="groutinglineMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:true" style="width: 246px; height: 32px;">
                         产品商标：
-                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px'" style="width:165px;height:32px;">
+                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',multiple:true" style="width:315px;height:30px;">
 
                         成型工号：
                         <input class="easyui-combobox" id="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getUser&select=1',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">

wwwroot/mes/rpt/rpt340/rpt.ashx

@@ -49,8 +49,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				string highFlag = context.Request["highFlagMaster"];
 				if (highFlag == "") highFlag = "-1";
 				//商标id
-				 string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
-				logoId = logoId==""?string.Empty:"AND GDD.LOGOID=" + logoId;
+				string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
+				string logoIds = context.Request["LOGONAME[]"] is object ? context.Request["LOGONAME[]"].ToString() : "";
+				//logoId = logoId==""?string.Empty:"AND GDD.LOGOID=" + logoId;
+				//logoId = logoIds==""?string.Empty:"AND GDD.LOGOID IN (" + logoIds +") ";
+				logoId = logoId==""?logoIds==""?string.Empty:"AND GDD.LOGOID IN (" + logoIds +") ":"AND GDD.LOGOID=" + logoId;
+
 				string inn=logoId==""?string.Empty:"INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = P.GROUTINGDAILYDETAILID";
 				string procedureId = context.Request["procedureidMaster[]"] is object ? context.Request["procedureidMaster[]"].ToString() : "0";
 				if (procedureId == "0" && context.Request["procedureidMaster"] is object) procedureId = context.Request["procedureidMaster"].ToString();
@@ -62,437 +66,362 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				string workshopcodeMaster = context.Request["workshopcodeMaster"] is object ? context.Request["workshopcodeMaster"].ToString() : "";
 
 				//读取报表数据
-				string sqlStr = @"
-					WITH 
-					注浆 AS 
-					(
-						SELECT
-							GROUPING_ID ( TO_CHAR( H.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( H.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-		
-							SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_一车间,
-							SUM(CASE WHEN ( H.DATATYPE = 1 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数_二车间,
-							SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_三车间,
-							SUM(DECODE(H.DATATYPE,1,1,0)) AS 注浆数_合计,
-		
-							SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆撤销数_一车间,
-							SUM(CASE WHEN ( H.DATATYPE = 2 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆撤销数_二车间,
-							SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆撤销数_三车间,
-							SUM(DECODE(H.DATATYPE,2,1,0)) AS 注浆撤销数_合计
-						FROM
-							TP_PM_GOODSCHANGEHISTORY H 
-							INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = H.GROUTINGDAILYDETAILID
-							INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
-							INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-							INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
-						WHERE
-							G.SCRAPSUMFLAG = '1'
-							AND H.CREATETIME >= @DATEBEGIN@
-							AND H.CREATETIME < @DATEEND@
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
-							{LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( H.CREATETIME, 'YYYYMM' ), ( ) )
-					),
-					--1-1交坯  交坯 2#-交坯 1#-交坯(1,88,92,118)
-					--包装 9-0包装(107,13)
-					工序产量 AS
-					(
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 交坯_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 17 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 自改交坯_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 55 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯入库_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 56 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯出库_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 2 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 改洗_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 61 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 二检_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 53 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯入库_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 54 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯出库_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 81 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 62 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 吹风_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 64 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 施釉交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 3 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 4 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线下施釉_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 65 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 5 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 9 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 10 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 11 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检出窑交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧补釉_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧登窑_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧出窑交接_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 条码打印_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 13 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装_一车间,
-		
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 交坯_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 2 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 改洗_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 61 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 二检_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 53 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯入库_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 54 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯出库_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 62 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 吹风_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 64 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 施釉交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 3 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 线上施釉_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 65 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 刮登交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID  = 5 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 登窑_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 9 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 入窑_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 10 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 卸窑_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 11 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 成检出窑交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 57 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 60 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧补釉_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 14 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登窑_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 58 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧出窑交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 78 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 条码打印_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 13 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 包装_二车间,
-		
-		
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 交坯_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 91 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 毛坯库入_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 93 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 打磨_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 94 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 上水_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 117 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 二检_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 97 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库入_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 119 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库出_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 115 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 吹风_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 98 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 施釉_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 99 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 刮登_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 100 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 釉坯库入_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 101 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 登窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 102 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 入窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 103 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 卸窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 104 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检交接_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 106 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成瓷库_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧交接_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧补釉_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登窑_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧出窑交接_三车间	,		
-							SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 条码打印_三车间	,	
-							SUM(CASE WHEN P.PROCEDUREID = 107 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装_三车间
-						FROM
-							TP_PM_PRODUCTIONDATA P
-							INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-							INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-							INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                            {INN}
-						WHERE
-							P.CREATETIME >= @DATEBEGIN@
-							AND P.CREATETIME < @DATEEND@
-							AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 1,2,3,4,5,9,10,11,13,14,17,53,54,55,56,57,58,60,61,62,64,65,78,81,88,91,92,93,94,97,98,99,100,101,102,103,104,106,107,115,117,118,119 )) OR P.PROCEDUREID in ({PROCEDUREID}))
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-					),
-					工序产量撤销 AS
-					(
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 交坯撤销_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 17 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 自改交坯撤销_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 55 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯入库撤销_一车间,
-							SUM(CASE WHEN P.PROCEDUREID = 56 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯出库撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 2 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 改洗撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 61 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 二检撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 53 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯入库撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 54 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯出库撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 81 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 62 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 吹风撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 64 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 施釉交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 3 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 4 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线下施釉撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 65 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 5 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 9 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 10 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 11 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧补釉撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧登窑撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 条码打印撤销_一车间,	
-							SUM(CASE WHEN P.PROCEDUREID in (107,13) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装撤销_一车间,
-		
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 交坯撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 2 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 改洗撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 61 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 二检撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 53 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯入库撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 54 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯出库撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 62 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 吹风撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 64 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 施釉交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 3 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 线上施釉撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 65 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 刮登交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID  = 5 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 登窑撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 9 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 入窑撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 10 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 卸窑撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 11 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 57 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 60 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧补釉撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 14 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登窑撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 58 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 78 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 条码打印撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID in (107,13) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 包装撤销_二车间,
-		
-		
-							SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 交坯撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 91 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 毛坯库入撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 93 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 打磨撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 94 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 上水撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 117 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 二检撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 97 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库入撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 119 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库出撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 115 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 吹风撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 98 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 施釉撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 99 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 刮登撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 100 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 釉坯库入撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 101 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 登窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 102 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 入窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 103 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 卸窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 104 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检交接撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 106 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成瓷库撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧交接撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧补釉撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登窑撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_三车间	,		
-							SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 条码打印撤销_三车间	,	
-								SUM(CASE WHEN P.PROCEDUREID in (107,13) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装撤销_三车间
-		
-						FROM
-							TP_PM_PRODUCTIONDATA P
-							INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-							INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-							INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                            {INN}
-						WHERE
-							P.BACKOUTTIME >= @DATEBEGIN@
-							AND P.BACKOUTTIME < @DATEEND@
-							AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 1,2,3,4,5,9,10,11,13,14,17,53,54,55,56,57,58,60,61,62,64,65,78,81,88,91,92,93,94,97,98,99,100,101,102,103,104,106,107,115,117,118,119 )) OR P.PROCEDUREID in ({PROCEDUREID}))
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-					),二车间转三车间 AS (
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID = 99 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 100 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 釉坯库入_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 101 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 102 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 103 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 104 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检交接_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 106 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成瓷库_三车间	,
-							--SUM(CASE WHEN P.PROCEDUREID = 58 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS  条码打印_三车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 107 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装_三车间
-						FROM
-							TP_PM_PRODUCTIONDATA P
-						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                        {INN}
-						WHERE
-							P.CREATETIME >= @DATEBEGIN@
-							AND P.CREATETIME < @DATEEND@
-							AND ('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 99,100,101,102,103,104,106,58 ) OR P.PROCEDUREID in ({PROCEDUREID}))
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-
-					),二车间转三车间撤销 AS (
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID = 99 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 100 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 釉坯库入撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 101 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 102 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 103 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑撤销_三车间,
-							SUM(CASE WHEN P.PROCEDUREID = 104 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检交接撤销_三车间	,
-							SUM(CASE WHEN P.PROCEDUREID = 106 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成瓷库撤销_三车间	,
-							--SUM(CASE WHEN P.PROCEDUREID = 58 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS  条码打印撤销_三车间,	
-							SUM(CASE WHEN P.PROCEDUREID = 107 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装撤销_三车间
-						FROM
-							TP_PM_PRODUCTIONDATA P
-						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                        {INN}
-						WHERE
-							P.BACKOUTTIME >= @DATEBEGIN@
-							AND P.BACKOUTTIME < @DATEEND@
-							AND ('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 99,100,101,102,103,104,106,58 ) OR  P.PROCEDUREID in ({PROCEDUREID}))
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-					),三车间转二车间 AS (
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID = 11 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检出窑交接_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 13 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装_二车间
-						FROM
-							TP_PM_PRODUCTIONDATA P
-						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                        {INN}
-						WHERE
-							P.BACKOUTTIME >= @DATEBEGIN@
-							AND P.BACKOUTTIME < @DATEEND@
-							AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID in (11,13))  OR P.PROCEDUREID in ({PROCEDUREID}))
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-					),三车间转二车间撤销 AS (
-						SELECT
-							GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
-							NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-							SUM(CASE WHEN P.PROCEDUREID = 11 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_二车间,
-							SUM(CASE WHEN P.PROCEDUREID = 13 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装撤销_二车间
-						FROM
-							TP_PM_PRODUCTIONDATA P
-						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
-						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
-                        {INN}
-						WHERE
-							P.BACKOUTTIME >= @DATEBEGIN@
-							AND P.BACKOUTTIME < @DATEEND@
-							AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID in (11,13)) OR  P.PROCEDUREID in ({PROCEDUREID})) 
-							AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') 
-							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
-							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
-							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
-							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
-                            {LOGOID}
-						GROUP BY
-							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
-					)
-
-					SELECT
-						时间范围.时间,
-						NVL(注浆.注浆数_一车间,0) AS 注浆数_一车间,
-						NVL(注浆.注浆数_二车间,0) AS 注浆数_二车间,
-						NVL(注浆.注浆数_三车间,0) AS 注浆数_三车间,
-						NVL(注浆.注浆撤销数_一车间,0) AS 注浆撤销数_一车间,
-						NVL(注浆.注浆撤销数_二车间,0) AS 注浆撤销数_二车间,
-						NVL(注浆.注浆撤销数_三车间,0) AS 注浆撤销数_三车间,
-						NVL(注浆.注浆数_一车间,0) - NVL(注浆.注浆撤销数_一车间,0) AS 成坯数_一车间,
-						NVL(注浆.注浆数_二车间,0) - NVL(注浆.注浆撤销数_二车间,0) AS 成坯数_二车间,
-						NVL(注浆.注浆数_三车间,0) - NVL(注浆.注浆撤销数_三车间,0) AS 成坯数_三车间,
-	
-
-					    NVL(工序产量.交坯_一车间,0) - NVL(工序产量撤销.交坯撤销_一车间,0) as 交坯_一车间,
-					    NVL(工序产量.自改交坯_一车间,0) - NVL(工序产量撤销.自改交坯撤销_一车间,0)	 as 自改交坯_一车间,
-					    NVL(工序产量.毛坯入库_一车间,0) - NVL(工序产量撤销.毛坯入库撤销_一车间,0)	 as 毛坯入库_一车间,
-					    NVL(工序产量.毛坯出库_一车间,0) - NVL(工序产量撤销.毛坯出库撤销_一车间,0)	 as 毛坯出库_一车间,
-					    NVL(工序产量.改洗_一车间,0) - NVL(工序产量撤销.改洗撤销_一车间,0)	 as 改洗_一车间,
-					    NVL(工序产量.二检_一车间,0) - NVL(工序产量撤销.二检撤销_一车间,0)	 as 二检_一车间,
-					    NVL(工序产量.精坯入库_一车间,0) - NVL(工序产量撤销.精坯入库撤销_一车间,0)	 as 精坯入库_一车间,
-					    NVL(工序产量.精坯出库_一车间,0) - NVL(工序产量撤销.精坯出库撤销_一车间,0)	 as 精坯出库_一车间,
-					    NVL(工序产量.线上施釉交接_一车间,0) - NVL(工序产量撤销.线上施釉交接撤销_一车间,0)	 as 线上施釉交接_一车间,
-					    NVL(工序产量.吹风_一车间,0) - NVL(工序产量撤销.吹风撤销_一车间,0) as 吹风_一车间,
-					    NVL(工序产量.施釉交接_一车间,0) - NVL(工序产量撤销.施釉交接撤销_一车间,0)	 as 施釉交接_一车间,
-					    NVL(工序产量.线上施釉_一车间,0) - NVL(工序产量撤销.线上施釉撤销_一车间,0)	 as 线上施釉_一车间,
-					    NVL(工序产量.线下施釉_一车间,0) -  NVL(工序产量撤销.线下施釉撤销_一车间,0)	 as 线下施釉_一车间,
-					    NVL(工序产量.刮登交接_一车间,0) - NVL(工序产量撤销.刮登交接撤销_一车间,0)	 as 刮登交接_一车间,
-					    NVL(工序产量.登窑_一车间,0) - NVL(工序产量撤销.登窑撤销_一车间,0)	 as 登窑_一车间,
-					    NVL(工序产量.入窑_一车间,0) - NVL(工序产量撤销.入窑撤销_一车间,0)	 as 入窑_一车间,
-					    NVL(工序产量.卸窑_一车间,0) - nvl(工序产量撤销.卸窑撤销_一车间,0)	 as 卸窑_一车间,
-					    NVL(工序产量.成检出窑交接_一车间,0) - NVL(工序产量撤销.成检出窑交接撤销_一车间,0)	 as 成检出窑交接_一车间,
-					    NVL(工序产量.重烧交接_一车间,0) - NVL(工序产量撤销.重烧交接撤销_一车间,0)	 as 重烧交接_一车间,
-					    NVL(工序产量.重烧补釉_一车间,0) -  nvl(工序产量撤销.重烧补釉撤销_一车间,0)	 as 重烧补釉_一车间,
-					    NVL(工序产量.重烧登窑_一车间,0) - NVL(工序产量撤销.重烧登窑撤销_一车间	,0) as 重烧登窑_一车间,
-					    NVL(工序产量.重烧出窑交接_一车间,0) - NVL(工序产量撤销.重烧出窑交接撤销_一车间,0)	 as 重烧出窑交接_一车间,
-					    nvl(工序产量.条码打印_一车间,0) -  NVL(工序产量撤销.条码打印撤销_一车间,0)	 as 条码打印_一车间,
-					    NVL(工序产量.包装_一车间,0) - NVL(工序产量撤销.包装撤销_一车间,0)	 as 包装_一车间,
-	
-						nvl(工序产量.交坯_二车间,0) - nvl(工序产量撤销.交坯撤销_二车间,0) as 交坯_二车间,
-						nvl(工序产量.改洗_二车间,0) - nvl(工序产量撤销.改洗撤销_二车间,0) as 改洗_二车间,
-						nvl(工序产量.二检_二车间,0) - nvl(工序产量撤销.二检撤销_二车间,0) as 二检_二车间,
-						nvl(工序产量.精坯入库_二车间,0) - nvl(工序产量撤销.精坯入库撤销_二车间,0) as 精坯入库_二车间,
-						nvl(工序产量.精坯出库_二车间,0) - nvl(工序产量撤销.精坯出库撤销_二车间,0) as 精坯出库_二车间,
-						nvl(工序产量.吹风_二车间,0) - nvl(工序产量撤销.吹风撤销_二车间,0) as 吹风_二车间,
-						nvl(工序产量.施釉交接_二车间,0) - nvl(工序产量撤销.施釉交接撤销_二车间,0) as 施釉交接_二车间,
-						nvl(工序产量.线上施釉_二车间,0) - nvl(工序产量撤销.线上施釉撤销_二车间,0) as 线上施釉_二车间,
-						nvl(工序产量.刮登交接_二车间,0) - nvl(工序产量撤销.刮登交接撤销_二车间,0) as 刮登交接_二车间,
-						nvl(工序产量.登窑_二车间,0) - nvl(工序产量撤销.登窑撤销_二车间,0) as 登窑_二车间,
-						nvl(工序产量.入窑_二车间,0) - nvl(工序产量撤销.入窑撤销_二车间,0) as 入窑_二车间,
-						nvl(工序产量.卸窑_二车间,0) - nvl(工序产量撤销.卸窑撤销_二车间,0) as 卸窑_二车间,
-						nvl(工序产量.成检出窑交接_二车间,0) - nvl(工序产量撤销.成检出窑交接撤销_二车间,0) + nvl(三车间转二车间.成检出窑交接_二车间,0) - nvl(三车间转二车间撤销.成检出窑交接撤销_二车间,0) as 成检出窑交接_二车间,
-						nvl(工序产量.重烧交接_二车间,0) - nvl(工序产量撤销.重烧交接撤销_二车间,0) as 重烧交接_二车间,
-						nvl(工序产量.重烧补釉_二车间,0) - nvl(工序产量撤销.重烧补釉撤销_二车间,0) as 重烧补釉_二车间,
-						nvl(工序产量.重烧登窑_二车间,0) - nvl(工序产量撤销.重烧登窑撤销_二车间,0) as 重烧登窑_二车间,
-						nvl(工序产量.重烧出窑交接_二车间,0) - nvl(工序产量撤销.重烧出窑交接撤销_二车间,0) as 重烧出窑交接_二车间,
-						nvl(工序产量.条码打印_二车间,0) - nvl(工序产量撤销.条码打印撤销_二车间,0) as 条码打印_二车间,
-						nvl(工序产量.包装_二车间,0) - nvl(工序产量撤销.包装撤销_二车间,0) + nvl(三车间转二车间.包装_二车间,0) - nvl(三车间转二车间撤销.包装撤销_二车间,0) as 包装_二车间,
-	
-						nvl(工序产量.交坯_三车间,0) - nvl(工序产量撤销.交坯撤销_三车间,0) as 交坯_三车间,
-						nvl(工序产量.毛坯库入_三车间,0) - nvl(工序产量撤销.毛坯库入撤销_三车间,0) as 毛坯库入_三车间,
-						nvl(工序产量.打磨_三车间,0) -nvl( 工序产量撤销.打磨撤销_三车间,0) as 打磨_三车间,
-						nvl(工序产量.上水_三车间,0) - nvl(工序产量撤销.上水撤销_三车间,0) as 上水_三车间,
-						nvl(工序产量.二检_三车间,0) - nvl(工序产量撤销.二检撤销_三车间,0) as 二检_三车间,
-						nvl(工序产量.精坯库出_三车间,0) - nvl(工序产量撤销.精坯库出撤销_三车间,0) as 精坯库出_三车间,	
-						nvl(工序产量.精坯库入_三车间,0) - nvl(工序产量撤销.精坯库入撤销_三车间,0) as 精坯库入_三车间,
-						nvl(工序产量.吹风_三车间,0) - nvl(工序产量撤销.吹风撤销_三车间,0) as 吹风_三车间,
-						nvl(工序产量.施釉_三车间,0) - nvl(工序产量撤销.施釉撤销_三车间,0) as 施釉_三车间,
-						nvl(工序产量.刮登_三车间,0) - nvl(工序产量撤销.刮登撤销_三车间,0) + nvl(二车间转三车间.刮登_三车间,0) - nvl(二车间转三车间撤销.刮登撤销_三车间,0) as 刮登_三车间,
-						nvl(工序产量.釉坯库入_三车间,0) - nvl(工序产量撤销.釉坯库入撤销_三车间,0) + nvl(二车间转三车间.釉坯库入_三车间,0) - nvl(二车间转三车间撤销.釉坯库入撤销_三车间,0) as 釉坯库入_三车间,
-						nvl(工序产量.登窑_三车间,0) - nvl(工序产量撤销.登窑撤销_三车间,0) + nvl(二车间转三车间.登窑_三车间,0) - nvl(二车间转三车间撤销.登窑撤销_三车间,0) as 登窑_三车间,
-						nvl(工序产量.入窑_三车间,0) - nvl(工序产量撤销.入窑撤销_三车间,0) + nvl(二车间转三车间.入窑_三车间,0) - nvl(二车间转三车间撤销.入窑撤销_三车间,0) as 入窑_三车间,
-						nvl(工序产量.卸窑_三车间,0) - nvl(工序产量撤销.卸窑撤销_三车间,0) + nvl(二车间转三车间.卸窑_三车间,0) - nvl(二车间转三车间撤销.卸窑撤销_三车间,0) as 卸窑_三车间,
-						nvl(工序产量.成检交接_三车间,0) - nvl(工序产量撤销.成检交接撤销_三车间,0) + nvl(二车间转三车间.成检交接_三车间,0) - nvl(二车间转三车间撤销.成检交接撤销_三车间,0) as 成检交接_三车间,
-						nvl(工序产量.成瓷库_三车间,0) - nvl(工序产量撤销.成瓷库撤销_三车间,0)  + nvl(二车间转三车间.成瓷库_三车间,0) - nvl(二车间转三车间撤销.成瓷库撤销_三车间,0) as 成瓷库_三车间,
-						nvl(工序产量.重烧交接_三车间,0) - nvl(工序产量撤销.重烧交接撤销_三车间,0) as 重烧交接_三车间,
-						nvl(工序产量.重烧补釉_三车间,0) - nvl(工序产量撤销.重烧补釉撤销_三车间,0) as 重烧补釉_三车间,
-						nvl(工序产量.重烧登窑_三车间,0) - nvl(工序产量撤销.重烧登窑撤销_三车间,0) as 重烧登窑_三车间,
-						nvl(工序产量.重烧出窑交接_三车间,0) - nvl(工序产量撤销.重烧出窑交接撤销_三车间,0) as 重烧出窑交接_三车间,
-						nvl(工序产量.条码打印_三车间,0) - nvl(工序产量撤销.条码打印撤销_三车间,0) as 条码打印_三车间,
-						nvl(工序产量.包装_三车间,0) - nvl(工序产量撤销.包装撤销_三车间,0) + nvl(二车间转三车间.包装_三车间,0) - nvl(二车间转三车间撤销.包装撤销_三车间,0) as 包装_三车间
-
-					FROM
-						(SELECT
-							TO_CHAR( TO_DATE( @DATEFINISH@, 'yyyymmdd' ) + 1 - LEVEL, 'yyyymmdd' ) 时间 
-						FROM
-							DUAL 
-						CONNECT BY LEVEL <= TO_NUMBER( TO_DATE( @DATEFINISH@, 'yyyymmdd' ) - TO_DATE( @DATESTART@, 'yyyymmdd' ) ) + 1) 时间范围
-						LEFT JOIN 注浆 ON 注浆.时间 = 时间范围.时间
-						LEFT JOIN 工序产量 ON 工序产量.时间 = 时间范围.时间
-						LEFT JOIN 工序产量撤销 ON 工序产量撤销.时间 = 时间范围.时间
-						LEFT JOIN 二车间转三车间撤销 ON 二车间转三车间撤销.时间 = 时间范围.时间
-						LEFT JOIN 三车间转二车间撤销 ON 三车间转二车间撤销.时间 = 时间范围.时间
-						LEFT JOIN 二车间转三车间 ON 二车间转三车间.时间 = 时间范围.时间
-						LEFT JOIN 三车间转二车间 ON 三车间转二车间.时间 = 时间范围.时间
-					ORDER BY 
-						时间范围.时间
-                ".Replace("YYYYMM", totalMaster)
+				string sqlStr = @" WITH  注浆 AS "+
+					"( SELECT GROUPING_ID ( TO_CHAR( H.CREATETIME, 'YYYYMM' ) ) AS GID,NVL(TO_CHAR( H.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_一车间,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 1 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数_二车间,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_三车间,"+
+						"	SUM(DECODE(H.DATATYPE,1,1,0)) AS 注浆数_合计,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆撤销数_一车间,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 2 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆撤销数_二车间,"+
+						"	SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆撤销数_三车间,"+
+						"	SUM(DECODE(H.DATATYPE,2,1,0)) AS 注浆撤销数_合计"+
+						" FROM TP_PM_GOODSCHANGEHISTORY H  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = H.GROUTINGDAILYDETAILID INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID"+
+						"	INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID"+
+						" WHERE G.SCRAPSUMFLAG = '1' AND H.CREATETIME >= @DATEBEGIN@ AND H.CREATETIME < @DATEEND@ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') "+
+						"	AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0')  AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+						"	AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') "+
+						"	{LOGOID} "+
+						" GROUP BY GROUPING SETS ( TO_CHAR( H.CREATETIME, 'YYYYMM' ), ( ) ) "+
+					"),"+
+					// --1-1交坯  交坯 2#-交坯 1#-交坯(1,88,92,118)
+					//--包装 9-0包装(107,13)
+					" 工序产量 AS "+
+					" ( SELECT GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID, NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 交坯_一车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 17 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 自改交坯_一车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 55 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯入库_一车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 56 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯出库_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 2 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 改洗_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 61 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 二检_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 53 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯入库_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 54 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯出库_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 81 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉交接_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 62 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 吹风_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 64 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 施釉交接_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 3 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 4 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线下施釉_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 65 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登交接_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 5 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 9 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 10 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 11 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检出窑交接_一车间,"+	
+						" 	SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧交接_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧补釉_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧登窑_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧出窑交接_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 条码打印_一车间,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 13 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装_一车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 交坯_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 2 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 改洗_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 61 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 二检_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 53 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯入库_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 54 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯出库_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 62 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 吹风_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 64 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 施釉交接_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 3 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 线上施釉_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 65 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 刮登交接_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID  = 5 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 登窑_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 9 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 入窑_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 10 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 卸窑_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 11 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 成检出窑交接_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 57 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧交接_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 60 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧补釉_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 14 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登窑_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 58 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧出窑交接_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 78 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 条码打印_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 13 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 包装_二车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 交坯_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 91 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 毛坯库入_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 93 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 打磨_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 94 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 上水_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 117 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 二检_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 97 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库入_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 119 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库出_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 115 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 吹风_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 98 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 施釉_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 99 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 刮登_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 100 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 釉坯库入_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 101 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 登窑_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 102 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 入窑_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 103 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 卸窑_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 104 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检交接_三车间	,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 106 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成瓷库_三车间	,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧交接_三车间	,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧补釉_三车间	,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登窑_三车间	,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧出窑交接_三车间	,	"+	
+						" 	SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 条码打印_三车间	,	"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 107 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装_三车间"+
+						" FROM TP_PM_PRODUCTIONDATA P INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID "+
+						" 	INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                        "     {INN}"+
+						" WHERE P.CREATETIME >= @DATEBEGIN@ AND P.CREATETIME < @DATEEND@"+
+						" 	AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 1,2,3,4,5,9,10,11,13,14,17,53,54,55,56,57,58,60,61,62,64,65,78,81,88,91,92,93,94,97,98,99,100,101,102,103,104,106,107,115,117,118,119 )) OR P.PROCEDUREID in ({PROCEDUREID}))"+
+						" 	AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0')  AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+						" 	AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+						
+						" 	AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') "+
+                        "     {LOGOID} "+
+						" GROUP BY GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+					" ),"+
+					" 工序产量撤销 AS"+
+					" ( SELECT GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID, NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 交坯撤销_一车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 17 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 自改交坯撤销_一车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 55 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯入库撤销_一车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 56 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 毛坯出库撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 2 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 改洗撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 61 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 二检撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 53 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯入库撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 54 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 精坯出库撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 81 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 62 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 吹风撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 64 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 施釉交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 3 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线上施釉撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 4 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 线下施釉撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 65 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 5 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 9 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 10 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 11 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧补釉撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧登窑撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 条码打印撤销_一车间,	"+
+					" 		SUM(CASE WHEN P.PROCEDUREID in (107,13) and (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装撤销_一车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 交坯撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 2 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 改洗撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 61 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 二检撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 53 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯入库撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 54 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 精坯出库撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 62 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 吹风撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 64 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 施釉交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 3 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 线上施釉撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 65 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 刮登交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID  = 5 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 登窑撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 9 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 入窑撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 10 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 卸窑撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 11 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 57 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 60 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧补釉撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 14 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登窑撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 58 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 78 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 条码打印撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID in (107,13) and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 包装撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID in (1,88,92,118) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 交坯撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 91 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 毛坯库入撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 93 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 打磨撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 94 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 上水撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 117 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 二检撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 97 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库入撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 119 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 精坯库出撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 115 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 吹风撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 98 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 施釉撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 99 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 刮登撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 100 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 釉坯库入撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 101 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 登窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 102 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 入窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 103 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 卸窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 104 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检交接撤销_三车间	,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 106 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成瓷库撤销_三车间	,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 57 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧交接撤销_三车间	,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 60 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧补釉撤销_三车间	,"+
+				" 			SUM(CASE WHEN P.PROCEDUREID = 14 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登窑撤销_三车间	,"+
+				" 			SUM(CASE WHEN P.PROCEDUREID = 58 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧出窑交接撤销_三车间	,"+		
+				" 			SUM(CASE WHEN P.PROCEDUREID = 78 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 条码打印撤销_三车间	,	"+
+				" 				SUM(CASE WHEN P.PROCEDUREID in (107,13) and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装撤销_三车间"+
+					" 	FROM TP_PM_PRODUCTIONDATA P INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID  INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                      "       {INN} "+
+						" WHERE P.BACKOUTTIME >= @DATEBEGIN@ AND P.BACKOUTTIME < @DATEEND@"+
+							" AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 1,2,3,4,5,9,10,11,13,14,17,53,54,55,56,57,58,60,61,62,64,65,78,81,88,91,92,93,94,97,98,99,100,101,102,103,104,106,107,115,117,118,119 )) OR P.PROCEDUREID in ({PROCEDUREID}))"+
+							" AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0')  AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+							" AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+					
+						" 	AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') "+
+ "                            {LOGOID}"+
+	" 					GROUP BY GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+		" 			),二车间转三车间 AS ("+
+			" 			SELECT GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID, NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+				" 			SUM(CASE WHEN P.PROCEDUREID = 99 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 100 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 釉坯库入_三车间,"+
+						" 	SUM(CASE WHEN P.PROCEDUREID = 101 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑_三车间,"+
+							" SUM(CASE WHEN P.PROCEDUREID = 102 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑_三车间,"+
+							" SUM(CASE WHEN P.PROCEDUREID = 103 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑_三车间,"+
+							" SUM(CASE WHEN P.PROCEDUREID = 104 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检交接_三车间	,"+
+							" SUM(CASE WHEN P.PROCEDUREID = 106 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成瓷库_三车间	,"+
+							
+							" SUM(CASE WHEN P.PROCEDUREID = 107 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装_三车间"+
+						" FROM TP_PM_PRODUCTIONDATA P INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID "+
+						" INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                      "   {INN}"+
+						" WHERE P.CREATETIME >= @DATEBEGIN@ AND P.CREATETIME < @DATEEND@ AND ('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 99,100,101,102,103,104,106,58 ) OR P.PROCEDUREID in ({PROCEDUREID}))"+
+						" 	AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0')  AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+						" 	AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+						
+						" 	AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')"+
+                       "      {LOGOID}"+
+					" 	GROUP BY GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+				" 	),二车间转三车间撤销 AS ("+
+					" 	SELECT GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,"+
+					" 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 99 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 刮登撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 100 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 釉坯库入撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 101 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 登窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 102 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 入窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 103 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 3 )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 卸窑撤销_三车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 104 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成检交接撤销_三车间	,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 106 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 成瓷库撤销_三车间	,"+
+					
+					" 		SUM(CASE WHEN P.PROCEDUREID = 107 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND (PP.PROCEDUREID = 3 or PP.PROCEDUREID = 10) )> 0 and ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ) THEN 1 ELSE 0 END ) AS 包装撤销_三车间"+
+					" 	FROM TP_PM_PRODUCTIONDATA P INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID "+
+					" 	INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                    "     {INN}"+
+					" 	WHERE P.BACKOUTTIME >= @DATEBEGIN@ AND P.BACKOUTTIME < @DATEEND@ AND ('{PROCEDUREID}' = '0' AND P.PROCEDUREID IN ( 99,100,101,102,103,104,106,58 ) OR  P.PROCEDUREID in ({PROCEDUREID}))"+
+					" 		AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0')  AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+					" 		AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+					
+					" 		AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')"+
+                     "        {LOGOID}"+
+					" 	GROUP BY GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+					" ),三车间转二车间 AS ( SELECT GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,"+
+					" 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 11 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检出窑交接_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 13 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装_二车间"+
+					" 	FROM TP_PM_PRODUCTIONDATA P"+
+					" 	INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID"+
+					" 	INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID "+
+					" 	INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                   "      {INN}"+
+					" 	WHERE P.BACKOUTTIME >= @DATEBEGIN@ AND P.BACKOUTTIME < @DATEEND@"+
+					" 		AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID in (11,13))  OR P.PROCEDUREID in ({PROCEDUREID}))"+
+					" 		AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') "+
+					" 		AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+					" 		AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+					
+					" 		AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')"+
+                    "         {LOGOID}"+
+					" 	GROUP BY"+
+					" 		GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+					" ),三车间转二车间撤销 AS ("+
+					" 	SELECT"+
+					" 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,"+
+					" 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 11 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 成检出窑交接撤销_二车间,"+
+					" 		SUM(CASE WHEN P.PROCEDUREID = 13 AND (SELECT COUNT(1) FROM TP_PM_PRODUCTIONDATA PP WHERE PP.BARCODE = P.BARCODE AND PP.PROCEDUREID = 103 )> 0 and (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 包装撤销_二车间"+
+					" 	FROM"+
+					" 		TP_PM_PRODUCTIONDATA P"+
+					" 	INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID"+
+					" 	INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID "+
+					" 	INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID"+
+                    "     {INN}"+
+					" 	WHERE"+
+					" 		P.BACKOUTTIME >= @DATEBEGIN@"+
+					" 		AND P.BACKOUTTIME < @DATEEND@"+
+					" 		AND (('{PROCEDUREID}' = '0' AND P.PROCEDUREID in (11,13)) OR  P.PROCEDUREID in ({PROCEDUREID})) "+
+					" 		AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0') "+
+					" 		AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') "+
+					" 		AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')"+
+					
+					" 		AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')"+
+                    "         {LOGOID}"+
+					" 	GROUP BY"+
+					" 		GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )"+
+					" )"+
+
+					" SELECT"+
+					" 	时间范围.时间,"+
+					" 	NVL(注浆.注浆数_一车间,0) AS 注浆数_一车间,"+
+					" 	NVL(注浆.注浆数_二车间,0) AS 注浆数_二车间,"+
+					" 	NVL(注浆.注浆数_三车间,0) AS 注浆数_三车间,"+
+					" 	NVL(注浆.注浆撤销数_一车间,0) AS 注浆撤销数_一车间,"+
+					" 	NVL(注浆.注浆撤销数_二车间,0) AS 注浆撤销数_二车间,"+
+					" 	NVL(注浆.注浆撤销数_三车间,0) AS 注浆撤销数_三车间,"+
+					" 	NVL(注浆.注浆数_一车间,0) - NVL(注浆.注浆撤销数_一车间,0) AS 成坯数_一车间,"+
+					" 	NVL(注浆.注浆数_二车间,0) - NVL(注浆.注浆撤销数_二车间,0) AS 成坯数_二车间,"+
+					" 	NVL(注浆.注浆数_三车间,0) - NVL(注浆.注浆撤销数_三车间,0) AS 成坯数_三车间,"+
+					"     NVL(工序产量.交坯_一车间,0) - NVL(工序产量撤销.交坯撤销_一车间,0) as 交坯_一车间,"+
+					"     NVL(工序产量.自改交坯_一车间,0) - NVL(工序产量撤销.自改交坯撤销_一车间,0)	 as 自改交坯_一车间,"+
+					"     NVL(工序产量.毛坯入库_一车间,0) - NVL(工序产量撤销.毛坯入库撤销_一车间,0)	 as 毛坯入库_一车间,"+
+					"     NVL(工序产量.毛坯出库_一车间,0) - NVL(工序产量撤销.毛坯出库撤销_一车间,0)	 as 毛坯出库_一车间,"+
+					"     NVL(工序产量.改洗_一车间,0) - NVL(工序产量撤销.改洗撤销_一车间,0)	 as 改洗_一车间,"+
+					"     NVL(工序产量.二检_一车间,0) - NVL(工序产量撤销.二检撤销_一车间,0)	 as 二检_一车间,"+
+					"     NVL(工序产量.精坯入库_一车间,0) - NVL(工序产量撤销.精坯入库撤销_一车间,0)	 as 精坯入库_一车间,"+
+					"     NVL(工序产量.精坯出库_一车间,0) - NVL(工序产量撤销.精坯出库撤销_一车间,0)	 as 精坯出库_一车间,"+
+					"     NVL(工序产量.线上施釉交接_一车间,0) - NVL(工序产量撤销.线上施釉交接撤销_一车间,0)	 as 线上施釉交接_一车间,"+
+					"     NVL(工序产量.吹风_一车间,0) - NVL(工序产量撤销.吹风撤销_一车间,0) as 吹风_一车间,"+
+					"     NVL(工序产量.施釉交接_一车间,0) - NVL(工序产量撤销.施釉交接撤销_一车间,0)	 as 施釉交接_一车间,"+
+					"     NVL(工序产量.线上施釉_一车间,0) - NVL(工序产量撤销.线上施釉撤销_一车间,0)	 as 线上施釉_一车间,"+
+					"     NVL(工序产量.线下施釉_一车间,0) -  NVL(工序产量撤销.线下施釉撤销_一车间,0)	 as 线下施釉_一车间,"+
+					"     NVL(工序产量.刮登交接_一车间,0) - NVL(工序产量撤销.刮登交接撤销_一车间,0)	 as 刮登交接_一车间,"+
+					"     NVL(工序产量.登窑_一车间,0) - NVL(工序产量撤销.登窑撤销_一车间,0)	 as 登窑_一车间,"+
+					 "    NVL(工序产量.入窑_一车间,0) - NVL(工序产量撤销.入窑撤销_一车间,0)	 as 入窑_一车间,"+
+					"     NVL(工序产量.卸窑_一车间,0) - nvl(工序产量撤销.卸窑撤销_一车间,0)	 as 卸窑_一车间,"+
+					"     NVL(工序产量.成检出窑交接_一车间,0) - NVL(工序产量撤销.成检出窑交接撤销_一车间,0)	 as 成检出窑交接_一车间,"+
+					"     NVL(工序产量.重烧交接_一车间,0) - NVL(工序产量撤销.重烧交接撤销_一车间,0)	 as 重烧交接_一车间,"+
+					"     NVL(工序产量.重烧补釉_一车间,0) -  nvl(工序产量撤销.重烧补釉撤销_一车间,0)	 as 重烧补釉_一车间,"+
+					"     NVL(工序产量.重烧登窑_一车间,0) - NVL(工序产量撤销.重烧登窑撤销_一车间	,0) as 重烧登窑_一车间,"+
+					"     NVL(工序产量.重烧出窑交接_一车间,0) - NVL(工序产量撤销.重烧出窑交接撤销_一车间,0)	 as 重烧出窑交接_一车间,"+
+					"     nvl(工序产量.条码打印_一车间,0) -  NVL(工序产量撤销.条码打印撤销_一车间,0)	 as 条码打印_一车间,"+
+					"     NVL(工序产量.包装_一车间,0) - NVL(工序产量撤销.包装撤销_一车间,0)	 as 包装_一车间,"+
+					" 	nvl(工序产量.交坯_二车间,0) - nvl(工序产量撤销.交坯撤销_二车间,0) as 交坯_二车间,"+
+					" 	nvl(工序产量.改洗_二车间,0) - nvl(工序产量撤销.改洗撤销_二车间,0) as 改洗_二车间,"+
+					" 	nvl(工序产量.二检_二车间,0) - nvl(工序产量撤销.二检撤销_二车间,0) as 二检_二车间,"+
+					" 	nvl(工序产量.精坯入库_二车间,0) - nvl(工序产量撤销.精坯入库撤销_二车间,0) as 精坯入库_二车间,"+
+					" 	nvl(工序产量.精坯出库_二车间,0) - nvl(工序产量撤销.精坯出库撤销_二车间,0) as 精坯出库_二车间,"+
+					" 	nvl(工序产量.吹风_二车间,0) - nvl(工序产量撤销.吹风撤销_二车间,0) as 吹风_二车间,"+
+					" 	nvl(工序产量.施釉交接_二车间,0) - nvl(工序产量撤销.施釉交接撤销_二车间,0) as 施釉交接_二车间,"+
+					" 	nvl(工序产量.线上施釉_二车间,0) - nvl(工序产量撤销.线上施釉撤销_二车间,0) as 线上施釉_二车间,"+
+					" 	nvl(工序产量.刮登交接_二车间,0) - nvl(工序产量撤销.刮登交接撤销_二车间,0) as 刮登交接_二车间,"+
+					" 	nvl(工序产量.登窑_二车间,0) - nvl(工序产量撤销.登窑撤销_二车间,0) as 登窑_二车间,"+
+					" 	nvl(工序产量.入窑_二车间,0) - nvl(工序产量撤销.入窑撤销_二车间,0) as 入窑_二车间,"+
+					" 	nvl(工序产量.卸窑_二车间,0) - nvl(工序产量撤销.卸窑撤销_二车间,0) as 卸窑_二车间,"+
+					" 	nvl(工序产量.成检出窑交接_二车间,0) - nvl(工序产量撤销.成检出窑交接撤销_二车间,0) + nvl(三车间转二车间.成检出窑交接_二车间,0) - nvl(三车间转二车间撤销.成检出窑交接撤销_二车间,0) as 成检出窑交接_二车间,"+
+					" 	nvl(工序产量.重烧交接_二车间,0) - nvl(工序产量撤销.重烧交接撤销_二车间,0) as 重烧交接_二车间,"+
+					" 	nvl(工序产量.重烧补釉_二车间,0) - nvl(工序产量撤销.重烧补釉撤销_二车间,0) as 重烧补釉_二车间,"+
+					" 	nvl(工序产量.重烧登窑_二车间,0) - nvl(工序产量撤销.重烧登窑撤销_二车间,0) as 重烧登窑_二车间,"+
+					" 	nvl(工序产量.重烧出窑交接_二车间,0) - nvl(工序产量撤销.重烧出窑交接撤销_二车间,0) as 重烧出窑交接_二车间,"+
+					" 	nvl(工序产量.条码打印_二车间,0) - nvl(工序产量撤销.条码打印撤销_二车间,0) as 条码打印_二车间,"+
+					" 	nvl(工序产量.包装_二车间,0) - nvl(工序产量撤销.包装撤销_二车间,0) + nvl(三车间转二车间.包装_二车间,0) - nvl(三车间转二车间撤销.包装撤销_二车间,0) as 包装_二车间,"+
+					" 	nvl(工序产量.交坯_三车间,0) - nvl(工序产量撤销.交坯撤销_三车间,0) as 交坯_三车间,"+
+					" 	nvl(工序产量.毛坯库入_三车间,0) - nvl(工序产量撤销.毛坯库入撤销_三车间,0) as 毛坯库入_三车间,"+
+					" 	nvl(工序产量.打磨_三车间,0) -nvl( 工序产量撤销.打磨撤销_三车间,0) as 打磨_三车间,"+
+					" 	nvl(工序产量.上水_三车间,0) - nvl(工序产量撤销.上水撤销_三车间,0) as 上水_三车间,"+
+					" 	nvl(工序产量.二检_三车间,0) - nvl(工序产量撤销.二检撤销_三车间,0) as 二检_三车间,"+
+					" 	nvl(工序产量.精坯库出_三车间,0) - nvl(工序产量撤销.精坯库出撤销_三车间,0) as 精坯库出_三车间,	"+
+					" 	nvl(工序产量.精坯库入_三车间,0) - nvl(工序产量撤销.精坯库入撤销_三车间,0) as 精坯库入_三车间,"+
+					" 	nvl(工序产量.吹风_三车间,0) - nvl(工序产量撤销.吹风撤销_三车间,0) as 吹风_三车间,"+
+					" 	nvl(工序产量.施釉_三车间,0) - nvl(工序产量撤销.施釉撤销_三车间,0) as 施釉_三车间,"+
+					" 	nvl(工序产量.刮登_三车间,0) - nvl(工序产量撤销.刮登撤销_三车间,0) + nvl(二车间转三车间.刮登_三车间,0) - nvl(二车间转三车间撤销.刮登撤销_三车间,0) as 刮登_三车间,"+
+					" 	nvl(工序产量.釉坯库入_三车间,0) - nvl(工序产量撤销.釉坯库入撤销_三车间,0) + nvl(二车间转三车间.釉坯库入_三车间,0) - nvl(二车间转三车间撤销.釉坯库入撤销_三车间,0) as 釉坯库入_三车间,"+ 
+					" 	nvl(工序产量.登窑_三车间,0) - nvl(工序产量撤销.登窑撤销_三车间,0) + nvl(二车间转三车间.登窑_三车间,0) - nvl(二车间转三车间撤销.登窑撤销_三车间,0) as 登窑_三车间,"+
+					" 	nvl(工序产量.入窑_三车间,0) - nvl(工序产量撤销.入窑撤销_三车间,0) + nvl(二车间转三车间.入窑_三车间,0) - nvl(二车间转三车间撤销.入窑撤销_三车间,0) as 入窑_三车间,"+
+					" 	nvl(工序产量.卸窑_三车间,0) - nvl(工序产量撤销.卸窑撤销_三车间,0) + nvl(二车间转三车间.卸窑_三车间,0) - nvl(二车间转三车间撤销.卸窑撤销_三车间,0) as 卸窑_三车间,"+
+					" 	nvl(工序产量.成检交接_三车间,0) - nvl(工序产量撤销.成检交接撤销_三车间,0) + nvl(二车间转三车间.成检交接_三车间,0) - nvl(二车间转三车间撤销.成检交接撤销_三车间,0) as 成检交接_三车间,"+
+					" 	nvl(工序产量.成瓷库_三车间,0) - nvl(工序产量撤销.成瓷库撤销_三车间,0)  + nvl(二车间转三车间.成瓷库_三车间,0) - nvl(二车间转三车间撤销.成瓷库撤销_三车间,0) as 成瓷库_三车间,"+
+					" 	nvl(工序产量.重烧交接_三车间,0) - nvl(工序产量撤销.重烧交接撤销_三车间,0) as 重烧交接_三车间,"+
+					" 	nvl(工序产量.重烧补釉_三车间,0) - nvl(工序产量撤销.重烧补釉撤销_三车间,0) as 重烧补釉_三车间,"+
+					" 	nvl(工序产量.重烧登窑_三车间,0) - nvl(工序产量撤销.重烧登窑撤销_三车间,0) as 重烧登窑_三车间,"+
+					" 	nvl(工序产量.重烧出窑交接_三车间,0) - nvl(工序产量撤销.重烧出窑交接撤销_三车间,0) as 重烧出窑交接_三车间,"+
+					" 	nvl(工序产量.条码打印_三车间,0) - nvl(工序产量撤销.条码打印撤销_三车间,0) as 条码打印_三车间,"+
+					" 	nvl(工序产量.包装_三车间,0) - nvl(工序产量撤销.包装撤销_三车间,0) + nvl(二车间转三车间.包装_三车间,0) - nvl(二车间转三车间撤销.包装撤销_三车间,0) as 包装_三车间"+
+					" FROM"+
+						" (SELECT"+
+							" TO_CHAR( TO_DATE( @DATEFINISH@, 'yyyymmdd' ) + 1 - LEVEL, 'yyyymmdd' ) 时间 "+
+						" FROM"+
+							" DUAL "+
+						" CONNECT BY LEVEL <= TO_NUMBER( TO_DATE( @DATEFINISH@, 'yyyymmdd' ) - TO_DATE( @DATESTART@, 'yyyymmdd' ) ) + 1) 时间范围"+
+						" LEFT JOIN 注浆 ON 注浆.时间 = 时间范围.时间"+
+						" LEFT JOIN 工序产量 ON 工序产量.时间 = 时间范围.时间"+
+						" LEFT JOIN 工序产量撤销 ON 工序产量撤销.时间 = 时间范围.时间"+
+						" LEFT JOIN 二车间转三车间撤销 ON 二车间转三车间撤销.时间 = 时间范围.时间"+
+						" LEFT JOIN 三车间转二车间撤销 ON 三车间转二车间撤销.时间 = 时间范围.时间"+
+						" LEFT JOIN 二车间转三车间 ON 二车间转三车间.时间 = 时间范围.时间"+
+						" LEFT JOIN 三车间转二车间 ON 三车间转二车间.时间 = 时间范围.时间"+
+					" ORDER BY "+
+						 " 时间范围.时间";
+                sqlStr = sqlStr.Replace("YYYYMM", totalMaster)
 				 .Replace("yyyymmdd", totalMaster)
 				 .Replace("{GOODSID}", goodsId)
 				 .Replace("{GROUTINGLINEID}", groutinglineId)

wwwroot/mes/rpt/rpt340/rpt_index.html

@@ -42,7 +42,7 @@
                         产品编码：
                         <input class="easyui-combobox" id="goodsMaster" name="goodsMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSID',textField:'GOODSCODE',panelHeight:'300px',editable:true,multiple:true" style="width:165px;height:32px;">
                         产品商标：
-                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px'" style="width:165px;height:32px;">
+                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',multiple:true" style="width:165px;height:32px;">
                         成型线号：
                         <input class="easyui-combobox" id="groutinglineMaster" name="groutinglineMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:true,multiple:true" style="width: 322px; height: 32px;">
 

wwwroot/mes/rpt/rpt341/rpt.ashx

@@ -74,7 +74,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 if (highFlag == "") highFlag = "-1";
                 //商标id
 			    string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
-			    logoId = logoId==""?string.Empty:"AND GDD.LOGOID=" + logoId;
+			    string logoIds = context.Request["LOGONAME[]"] is object ? context.Request["LOGONAME[]"].ToString() : "";
+                logoId = logoId==""?logoIds==""?string.Empty:"AND GDD.LOGOID IN (" + logoIds +") ":"AND GDD.LOGOID=" + logoId;
+			    //logoId = logoId==""?string.Empty:"AND GDD.LOGOID=" + logoId;
 
                 string procedureId = context.Request["procedureidMaster[]"] is object ? context.Request["procedureidMaster[]"].ToString() : "0";
                 if (procedureId == "0" && context.Request["procedureidMaster"] is object) procedureId = context.Request["procedureidMaster"].ToString();

wwwroot/mes/rpt/rpt341/rpt_index.html

@@ -38,7 +38,7 @@
                         产品类别：
                         <input class="easyui-combotree" id="goodstypecodeMaster" name="goodstypecodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoodsType',method:'get',panelHeight:'200px',editable:true" style="width:180px;height:32px;">
                         产品商标：
-                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px'" style="width:165px;height:32px;">
+                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px',multiple:true" style="width:165px;height:32px;">
                     </div>
                     <div style="padding-top:10px;">
                         产品编码：
@@ -152,8 +152,8 @@
                     queryParams: $('#ffMaster').serializeJson(),
                     url: 'rpt.ashx?m=master',
                     pageSize: 10,
-                    fixWidth: 120,
-                    mergeWidth: 120,
+                    fixWidth: 140,
+                    mergeWidth: 140,
                     splitChar: '_'
                 });
             }