1

wwwroot/mes/pc/daygroutingnum/daygroutingnum.ashx

@@ -28,9 +28,15 @@ public class daygroutingnum : IHttpHandler, IReadOnlySessionState
                 {
                     groutinglinecode = context.Request["groutinglinecode"];
                 }
+                string workshop = context.Request["workshopMaster[]"];
+                if (string.IsNullOrEmpty(workshop))
+                {
+                    workshop = context.Request["workshopMaster"];
+                }
                 string sqlStr = @"SELECT gl.groutinglineid   AS sid
                                   ,gl.day_grouting_num AS 日成型次数
                                   ,gl.groutinglinecode AS 成型线
+                                  ,gl.workshop ||'车间' as 车间
                               FROM tp_pc_groutingline gl
                              WHERE gl.valueflag = 1
                                AND gl.accountid = @accountid@";
@@ -40,7 +46,11 @@ public class daygroutingnum : IHttpHandler, IReadOnlySessionState
                 {
                     sqlStr += " AND gl.groutinglineid IN (" + groutinglinecode + ")";
                 }
-                sqlStr += " ORDER BY gl.groutinglinecode";
+                if (!string.IsNullOrEmpty(workshop))
+                {
+                    sqlStr += " AND gl.workshop IN (" + workshop + ")";
+                }
+                sqlStr += " ORDER BY gl.workshop,gl.groutinglinecode";
                 try
                 {
                     JsonResult data = Easyui.ExecuteJsonResult(conn, sqlStr, sqlPara);
@@ -59,6 +69,7 @@ public class daygroutingnum : IHttpHandler, IReadOnlySessionState
 
                 DataTable dt = conn.ExecuteDatatable(@"
                            SELECT gl.groutinglineid AS sid
+                                                  ,gl.workshop || '车间' as workshop
                                                   ,gl.day_grouting_num
                                                   ,gl.groutinglinecode
                                               FROM tp_pc_groutingline gl

wwwroot/mes/pc/daygroutingnum/daygroutingnum_edit.html

@@ -33,6 +33,10 @@
             </div>
             <div id="daygroutingnumMore2" style="display:block;">
                 <div class="w-div">
+                    <div class="w-fieldname">车间：</div>
+                    <div class="w-field"><input class="easyui-textbox" id="WORKSHOP" disabled="disabled" name="WORKSHOP" data-options="required:false,prompt:'请填写车间...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">成型线：</div>
                     <div class="w-field"><input class="easyui-textbox" id="GROUTINGLINECODE" disabled="disabled" name="GROUTINGLINECODE" data-options="required:false,prompt:'请填写成型线...',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>

wwwroot/mes/pc/daygroutingnum/daygroutingnum_index.html

@@ -29,8 +29,12 @@
             <div id="daygroutingnumSearchDiv" style="display:block; padding: 10px;">
                 <form id="daygroutingnumForm">
                     <div>
+                        车间：
+                        <input class="easyui-combobox" id="workshopMaster" name="workshopMaster" data-options="required:false,valueField:'value',textField:'text',editable:true,multiple:true,
+                               data:[{'text': '1车间', 'value': '1'},{'text': '2车间', 'value': '2'},{'text': '3车间', 'value': '3'}]"
+                               style=" width: 160px; height: 32px;">
                         成型线：
-                        <input class="easyui-combobox" id="groutinglinecode" name="groutinglinecode" data-options="required:false,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINENAME',panelHeight:'300px',editable:'true',multiple:true,limitToList:true" style="width:120px;height:32px;"> 
+                        <input class="easyui-combobox" id="groutinglinecode" name="groutinglinecode" data-options="required:false,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINENAME',panelHeight:'300px',editable:'true',multiple:true,limitToList:true" style="width:120px;height:32px;">
                         <a href="javascript:void(0)" id="daygroutingnumButtonSearchReset" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#daygroutingnumForm').form('clear')">清空</a>
                         <a href="javascript:void(0)" id="daygroutingnumButtonSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="daygroutingnumButtonSearchSubmit_Click()">搜索</a>
                     </div>
@@ -43,6 +47,7 @@
             <thead>
                 <tr>
                     <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
+                    <th data-options="field:'车间',title:'车间',align:'center',sortable:false"></th>
                     <th data-options="field:'成型线',title:'成型线',align:'center',sortable:false"></th>
                     <th data-options="field:'日成型次数',title:'日成型次数',align:'center',sortable:false"></th>
                 </tr>
@@ -72,7 +77,7 @@
             $('#daygroutingnumDatagrid').datagridDialog({
                 title: '修改数据',
                 width: 540,
-                height: 380,
+                height: 430,
                 url: 'daygroutingnum_edit.html',
                 requireSelect: true
             });