工序质量分析表 修改小计合计无数据问题 限制完成工序为3车间工序

wwwroot/mes/rpt/rpt005/rpt.ashx

@@ -71,7 +71,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
 
                 sqlStr =
-                "select --pdg.gid,\n" +
+                " SELECT * FROM( select --pdg.gid,\n" +
                 "       decode(pdg.gid, 1, '小计', 3, '合计', 0, pdg.goodstypename2, '--') \"产品二级类别\",\n" +
                 "       decode(pdg.gid, 0, pdg.goodstypename, '--') \"产品类别\",\n" +
                 "       decode(pdg.gid, 0, pdg.goodscode, '--') \"产品编码\",\n" +
@@ -191,7 +191,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 "                         pdata.goodscode),\n" +
                 "                         (pdata.productionlineid,pdata.goodstypename2),\n" +
                 "                         pdata.productionlineid)\n" +
-                " ) pdg";
+                " ) pdg  )";
 
                 //读取报表数据
                 sql.Append(sqlStr);

wwwroot/mes/rpt/rpt005/rpt_index.html

@@ -33,7 +33,7 @@
                         生产线号
                         <input class="easyui-combobox" id="productionlineidMaster" name="productionlineidMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getProductionLine&select=1',method:'get',valueField:'PRODUCTIONLINEID',textField:'PRODUCTIONLINECODE',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
                         完成工序
-                        <input class="easyui-combobox" id="procedureidMaster" name="procedureidMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getProcedure&select=1',method:'get',valueField:'PROCEDUREID',textField:'PROCEDURENAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">
+                        <input class="easyui-combobox" id="procedureidMaster" name="procedureidMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getProcedure3&select=1',method:'get',valueField:'PROCEDUREID',textField:'PROCEDURENAME',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
                         产品类别
                         <input class="easyui-combotree" id="goodstypecodeMaster" name="goodstypecodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoodsType',method:'get',panelHeight:'200px',editable:true" style="width:180px;height:32px;">
                         产品编码
@@ -49,15 +49,6 @@
         <table class="easyui-datagrid"
                id="DataGridMaster"
                data-options="toolbar: '#tb',method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
-            <thead>
-                <tr>
-                    <th data-options="field:'产品二级类别',title:'产品二级类别',align:'left',sortable:false"></th>
-                    <th data-options="field:'产品类别',title:'产品类别',align:'left',sortable:false"></th>
-                    <th data-options="field:'产品编码',title:'产品编码',align:'left',sortable:false"></th>
-                    <th data-options="field:'产品规格',title:'产品规格',align:'left',sortable:false"></th>
-                    <th data-options="field:'釉料类别',title:'釉料类别',align:'left',sortable:false"></th>
-                </tr>
-            </thead>
         </table>
     </div>
 
@@ -111,40 +102,11 @@
 
         //搜索提交
         function tbSearchSubmit() {
-
-            //加载动态字段
-            //$.post('rpt.ashx?m=field', {'productionlineidMaster':$('#productionlineidMaster').combobox('getValue'),'procedureidMaster':$('#procedureidMaster').combobox('getValues')}, function (columnData) {
-            //    var columnData = JSON.parse(columnData);
-            //    var jsonColumns = [
-            //        { 'field': '产品二级类别', 'title': '产品二级类别' },
-            //        { 'field': '产品类别', 'title': '产品类别' },
-            //        { 'field': '产品编码', 'title': '产品编码' },
-            //        { 'field': '产品规格', 'title': '产品规格' },
-            //        { 'field': '釉料类别', 'title': '釉料类别' }
-            //    ];
-
-            //    //动态列
-            //    for (var i = 0; i < columnData["rows"].length;i++) {
-            //        var c = JSON.parse('{ "field": "' + columnData["rows"][i]["PROCEDURENAME"] + '", "title": "' + columnData["rows"][i]["PROCEDURENAME"].toString().replace('_','#') + '" }');
-            //        jsonColumns.push(c);
-            //    }
-
-            //    //加载表格数据
-            //    $('#DataGridMaster').datagridLoad({
-            //        columns: [jsonColumns],
-            //        title: '工序产量分析表',
-            //        idField: 'SID',
-            //        queryParams: $('#ffMaster').serializeJson(),
-            //        url: 'rpt.ashx?m=master&id=' + request('id'),
-            //        pagination:true,
-            //        pageSize:100,
-            //        onSelect: LoadDataGridDetail
-            //    });
-            //});
-
+            $('#DataGridMaster').empty();
+            $('#DataGridMaster').innerHTML = '';
             if ($('#ffMaster').form("validate")) {
                 //工序产量分析表
-                $('#DataGridMaster').datagridLoad({
+                $('#DataGridMaster').datagridLoadRpt({
                     title: '',
                     idField: 'SID',
                     queryParams: $('#ffMaster').serializeJson(),
@@ -152,7 +114,9 @@
                     pageSize: 100,
                     fixWidth: 120,
                     mergeWidth: 80,
-                    splitChar: '_'
+                    columnMenu: '#btnColumnMenu',
+                    columnMoving: true,
+                    splitChar: '|'
                 });
             }