添加成型线 查询条件 并按照成型线分组排序数据

wwwroot/mes/rpt/rpt106/rpt.ashx

@@ -46,7 +46,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //读取报表数据
                 string sqlStr = @"
-				SELECT
+						SELECT
+					GROUTINGLINECODE AS 成型线编码,
 					GOODSCODE AS 产品编码,
 					期初数量,
 					接收数量,
@@ -57,6 +58,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				FROM
 					(
 					SELECT
+					GDD.GROUTINGLINECODE,
 						GDD.GOODSCODE,-- 期初 开始日期前
 						SUM(
 						CASE
@@ -108,8 +110,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													AND GDD.VALUEFLAG = '1' 
 													AND ( GDD.GOODSID IN ( {GOODSID} ) OR '{GOODSID}' = '0' ) 
 													AND ( GDD.GROUTINGDATE <= @DATEEND@ OR GDD.SCRAPTIME <= @DATEEND@ OR GDD.DELIVERTIME <= @DATEEND@ ) 
+													AND (GDD.GROUTINGLINECODE in (@GROUTINGLINECODE@) OR @GROUTINGLINECODE@ IS NULL)		
 													AND GDD.GROUTINGFLAG = '1' 									
 												GROUP BY
+												GDD.GROUTINGLINECODE,
 													GDD.GOODSCODE 
 												) 
 											WHERE
@@ -118,6 +122,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												OR 干补回收 <> 0 
 												OR 损坯数量 <> 0 
 												OR 发出数量 <> 0
+											ORDER BY GROUTINGLINECODE
                 ".Replace("{GOODSID}", goodsId);
 
                 if (context.Request["sort"] is object)
@@ -129,6 +134,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 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("GROUTINGLINECODE", context.Request["groutinglineMaster"].ToString()));
 
                 //获取数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());

wwwroot/mes/rpt/rpt106/rpt_index.html

@@ -28,6 +28,8 @@
                         <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 165px; height: 32px;">
                         截止日期：
                         <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" 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:'GROUTINGLINECODE',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:true ,multiple:false" style="width: 165px; height: 32px;">
                         产品编码：
                         <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;">
 
@@ -43,6 +45,7 @@
                    data-options="method:'get',border:false,singleSelect:true,fit:true,fitColumns:false">
                 <thead>
                     <tr>
+                        <th data-options="field:'成型线编码',title:'成型线编码',align:'left',sortable:true,width:80"></th>
                         <th data-options="field:'产品编码',title:'产品编码',align:'left',sortable:true,width:80"></th>
                         <th data-options="field:'期初数量',title:'期初数量',align:'left',sortable:true,width:80"></th>
                         <th data-options="field:'接收数量',title:'接收数量',align:'left',sortable:true,width:80"></th>