成型注浆报表加入--实时交坯个数 加入成型工段查询条件

wwwroot/mes/rpt/rpt306/rpt.ashx

@@ -14,32 +14,36 @@ using DK.XuWei.WebMes;
 
 public class rpt : IHttpHandler, IReadOnlySessionState
 {
-	public void ProcessRequest(HttpContext context)
-	{
-		context.Response.ContentType = "text/plain";
+    public void ProcessRequest(HttpContext context)
+    {
+        context.Response.ContentType = "text/plain";
 
 
 
-		using (IDataAccess conn = DataAccess.Create())
-		{
-			DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-			DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
-			//主表
-			string sqlStr = "";
-			if (context.Request["m"].ToString() == "Burnish")
-			{
-				//读取报表数据
-				sqlStr = @" WITH 累计次数 AS
+        using (IDataAccess conn = DataAccess.Create())
+        {
+            DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
+            // 250311 增加成型工段 
+            string groutingLineNo = context.Request["groutingLineNo"];
+            //主表
+            string sqlStr = "";
+            if (context.Request["m"].ToString() == "Burnish")
+            {
+                //读取报表数据
+                sqlStr = @" WITH 累计次数 AS
                              (SELECT gdd.groutinglineid
                                     ,gdd.goodsid
                                     ,MAX(gdd.groutingcount) 累计次数
                                 FROM tp_pm_groutingdailydetail gdd
                                 LEFT JOIN tp_pc_groutinglinedetail gld
                                   ON gld.groutinglinedetailid = gdd.groutinglinedetailid
+                                inner join  tp_pc_groutingline gl on gdd.GROUTINGLINEID = gl.GROUTINGLINEID
                                WHERE gdd.valueflag = 1
                                  AND gld.valueflag = 1
                                  AND gdd.groutinglinecode <> '公坯'
                                  AND gdd.groutingdate <= @DATEEND@
+                                 AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                GROUP BY gdd.groutinglineid
                                        ,gdd.goodsid)
                             SELECT tb1.统计方式
@@ -54,6 +58,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                    ,tb1.期初
                                    ,tb1.交坯个数
                                    ,tb1.交坯取消
+                                   ,tb1.实时交坯个数
                                    ,tb1.注浆个数
                                    ,tb1.注浆取消
                                    ,tb1.实时注浆个数
@@ -94,6 +99,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                           ,nvl((模型设置数量), 0) 模型设置数量
                                           ,nvl((应注模型数量), 0) 应注模型数量
                                           ,nvl((期初数), 0) 期初
+                                          ,(实时交坯个数) 实时交坯个数
                                           ,(交坯个数) 交坯个数
                                           ,(交坯取消) 交坯取消
                                           ,(注浆个数) 注浆个数
@@ -146,6 +152,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                   ,tttt.goodsspecification
                                                   ,tttt.车间
                                                   ,nvl(SUM(tttt.期初数), 0) 期初数
+                                                  ,nvl(SUM(tttt.实时交坯个数), 0) 实时交坯个数 
                                                   ,nvl(SUM(tttt.交坯个数), 0) 交坯个数
                                                   ,nvl(SUM(tttt.交坯取消), 0) 交坯取消
                                                   ,nvl(SUM(tttt.注浆损失), 0) 注浆损失
@@ -199,6 +206,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                   ,tt.groutinguserid
                                                                   ,tt.goodsid
                                                                   ,SUM(tt.期初数) 期初数
+                                                                  ,SUM(tt.实时交坯个数) 实时交坯个数
                                                                   ,SUM(tt.交坯个数) 交坯个数
                                                                   ,SUM(tt.交坯取消) 交坯取消
                                                                   ,SUM(tt.注浆损失) 注浆损失
@@ -223,7 +231,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT t.groutinglineid
                                                                            ,t.groutinguserid
                                                                            ,t.goodsid
-                                                                           ,COUNT(*) 交坯个数
+                                                                           ,COUNT(*) 实时交坯个数
+                                                                           ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
                                                                            ,NULL 应注次数
@@ -247,9 +256,49 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_productiondata t
+                                                                       inner join  tp_pc_groutingline gl on t.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE t.createtime >= @DATEBEGIN@
                                                                         AND t.createtime <= @DATEEND@
                                                                         AND t.procedureid = 7
+                                                                        AND t.valueflag = 1
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
+                                                                      GROUP BY t.groutinguserid
+                                                                              ,t.goodsid
+                                                                              ,t.groutinglineid) UNION ALL
+
+                                                                    (SELECT t.groutinglineid
+                                                                           ,t.groutinguserid
+                                                                           ,t.goodsid
+                                                                           ,NULL 实时交坯个数
+                                                                           ,COUNT(*) 交坯个数
+                                                                           ,NULL 交坯取消
+                                                                           ,NULL 模具数量
+                                                                           ,NULL 应注次数
+                                                                           ,NULL 期初数
+                                                                           ,NULL 模型设置数量
+                                                                           ,NULL 应注模型数量
+                                                                           ,NULL 注浆个数
+                                                                           ,NULL 注浆取消
+                                                                           ,NULL 实时注浆个数
+                                                                           ,NULL 注浆损失
+                                                                           ,NULL 注浆损失取消
+                                                                           ,NULL 开模注浆损失
+                                                                           ,NULL 开模注浆损失取消
+                                                                           ,NULL 实时注浆损失
+                                                                           ,NULL 成型盘点清除
+                                                                           ,NULL 成型盘点撤销
+                                                                           ,NULL 毛坯损失
+                                                                           ,NULL 毛坯损失取消
+                                                                           ,NULL 实时毛坯损失
+                                                                           ,NULL 在产清除
+                                                                           ,NULL 在产清除撤销
+                                                                           ,NULL 累计次数
+                                                                       FROM tp_pm_productiondata t
+                                                                       inner join  tp_pc_groutingline gl on t.GROUTINGLINEID = gl.GROUTINGLINEID
+                                                                      WHERE t.createtime >= @DATEBEGIN@
+                                                                        AND t.createtime <= @DATEEND@                                            
+                                                                        AND t.procedureid = 7
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY t.groutinguserid
                                                                               ,t.goodsid
                                                                               ,t.groutinglineid) UNION ALL
@@ -257,6 +306,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT t.groutinglineid
                                                                            ,t.groutinguserid
                                                                            ,t.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,COUNT(*) 交坯取消
                                                                            ,NULL 模具数量
@@ -281,9 +331,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_productiondata t
+                                                                       inner join  tp_pc_groutingline gl on t.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE t.backouttime >= @DATEBEGIN@
                                                                         AND t.backouttime <= @DATEEND@
                                                                         AND t.procedureid = 7
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY t.groutinguserid
                                                                               ,t.goodsid
                                                                               ,t.groutinglineid) UNION ALL
@@ -291,6 +343,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT line.groutinglineid
                                                                            ,line.userid groutinguserid
                                                                            ,detail.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,COUNT(DISTINCT detail.groutingmouldcode) 模具数量
@@ -335,6 +388,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT gbd.groutinglineid
                                                                            ,gbd.userid groutinguserid
                                                                            ,gbd.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -359,7 +413,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_groutingdailydetail_back_days gbd
+                                                                        inner join  tp_pc_groutingline gl on gbd.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE gbd.backuptime = @DATEBEGIN@
+                                                                      AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )   
                                                                       GROUP BY gbd.groutinglineid
                                                                               ,gbd.userid
                                                                               ,gbd.goodsid) UNION ALL
@@ -367,6 +423,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT d.groutinglineid
                                                                            ,d.userid groutinguserid
                                                                            ,d.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -453,8 +510,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                        FROM tp_pm_goodschangehistory t
                                                                        LEFT JOIN tp_pm_groutingdailydetail d
                                                                          ON d.groutingdailydetailid = t.groutingdailydetailid
+                                                                       inner join  tp_pc_groutingline gl on d.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE t.createtime >= @DATEBEGIN@
                                                                         AND t.createtime <= @DATEEND@
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY d.groutinglineid
                                                                               ,d.userid
                                                                               ,d.goodsid) UNION ALL
@@ -462,6 +521,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT gdd.groutinglineid
                                                                            ,gdd.userid groutinguserid
                                                                            ,gdd.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -486,11 +546,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_groutingdailydetail gdd
+                                                                        inner join  tp_pc_groutingline gl on gdd.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE gdd.valueflag = 1
                                                                         AND gdd.groutingflag = 1
                                                                         AND gdd.accountid = 1
                                                                         AND gdd.groutingdate >= @DATEBEGIN@
                                                                         AND gdd.groutingdate <= @DATEEND@
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY gdd.groutinglineid
                                                                               ,gdd.userid
                                                                               ,gdd.goodsid) UNION ALL
@@ -498,6 +560,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT gdd.groutinglineid
                                                                            ,gdd.userid groutinguserid
                                                                            ,gdd.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -522,17 +585,20 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_groutingdailydetail gdd
+                                                                       inner join  tp_pc_groutingline gl on gdd.GROUTINGLINEID = gl.GROUTINGLINEID
                                                                       WHERE gdd.valueflag = 1
                                                                         AND gdd.groutingflag = 1
                                                                         AND gdd.accountid = 1
                                                                         AND gdd.scraptime >= @DATEBEGIN@
                                                                         AND gdd.scraptime <= @DATEEND@
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )   
                                                                       GROUP BY gdd.groutinglineid
                                                                               ,gdd.userid
                                                                               ,gdd.goodsid) UNION ALL
                                                                     (SELECT t.groutinglineid
                                                                            ,t.groutinguserid
                                                                            ,t.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -562,10 +628,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_scrapproduct t
+                                                                        inner join  tp_pc_groutingline gl on t.GROUTINGLINEID = gl.GROUTINGLINEID                                                                       
                                                                       WHERE t.procedureid IN (1, 2, 3, 4, 5, 6, 36, 52, 54, 51)
                                                                         AND t.auditstatus = 1
                                                                         AND t.auditdate >= @DATEBEGIN@
                                                                         AND t.auditdate <= @DATEEND@
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY t.groutinglineid
                                                                               ,t.groutinguserid
                                                                               ,t.goodsid) UNION ALL
@@ -573,6 +641,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     (SELECT t.groutinglineid
                                                                            ,t.groutinguserid
                                                                            ,t.goodsid
+                                                                           ,NULL 实时交坯个数
                                                                            ,NULL 交坯个数
                                                                            ,NULL 交坯取消
                                                                            ,NULL 模具数量
@@ -597,10 +666,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                            ,NULL 在产清除撤销
                                                                            ,NULL 累计次数
                                                                        FROM tp_pm_scrapproduct t
-                                                                      WHERE t.procedureid IN (1, 2, 3, 4, 5, 6, 36, 52, 54, 51)
-                                               
+                                                                        inner join  tp_pc_groutingline gl on t.GROUTINGLINEID = gl.GROUTINGLINEID
+                                                                      WHERE t.procedureid IN (1, 2, 3, 4, 5, 6, 36, 52, 54, 51)                                               
                                                                         AND t.backouttime >= @DATEBEGIN@
                                                                         AND t.backouttime <= @DATEEND@
+                                                                        AND (@GROUTINGLINENO@ is null or @GROUTINGLINENO@ = '' or instr( gl.GROUTINGLINENO,@GROUTINGLINENO@) > 0 )
                                                                       GROUP BY t.groutinglineid
                                                                               ,t.groutinguserid
                                                                               ,t.goodsid)) tt
@@ -625,6 +695,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 OR 应注模型数量 <> 0
                                 OR 期初 <> 0
                                 OR 注浆个数 <> 0
+                                OR 实时交坯个数 <> 0
                                 OR 交坯个数 <> 0
                                 OR 交坯取消 <> 0
                                 OR 干损损失 <> 0
@@ -637,35 +708,35 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 OR 期末数 <> 0
                                 OR 成型盘点清除 <> 0
                                 OR 成型盘点撤销 <> 0 ";
-			}
-			//获取查询条件
-			List<CDAParameter> sqlPara = new List<CDAParameter>();
-			sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));
-			sqlPara.Add(new CDAParameter("DATEEND", dateend, DataType.DateTime));
-			//sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
-			//获取分页参数
-			int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-			int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
-			string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
-			string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
+            }
+            //获取查询条件
+            List<CDAParameter> sqlPara = new List<CDAParameter>();
+            sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));
+            sqlPara.Add(new CDAParameter("DATEEND", dateend, DataType.DateTime));
+            sqlPara.Add(new CDAParameter("GROUTINGLINENO", groutingLineNo));
+            //获取分页参数
+            int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
+            int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+            string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
+            string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 
-			//获取分页数据    
-			int total = 0;
-			DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-			string jsonStr = new JsonResult(dt) { total = total }.ToJson();
+            //获取分页数据    
+            int total = 0;
+            DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+            string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
-			context.Response.Write(jsonStr);
+            context.Response.Write(jsonStr);
 
-		}
+        }
 
-	}
+    }
 
-	public bool IsReusable
-	{
-		get
-		{
-			return false;
-		}
-	}
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
 
 }

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -32,6 +32,9 @@
                         截止日期：
                         <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
                         <!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">-->
+                        成型工段：
+                        <input class="easyui-textbox" id="groutingLineNo" name="groutingLineNo" data-options="required:false,prompt:'',tipPosition:'top'" style="width:80px;height:32px;">
+
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -66,11 +69,13 @@
 
         });
         function toClear() {
+            $('#ffMaster').form('clear');
+
             var ctime = new Date();
             var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
             $("#datebeginMaster").datetimebox("setValue", beginDate);
-            $("#dateendMaster").datetimebox("setValue", endDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);             
         }
 
         //搜索提交