在工序出站汇报单维护模块研究下或与过滤条件，在高级自定义过滤中做就行。 现在条件过滤都是单一的，比如根据车间过滤一次性只能过滤查询一个车间的数据，通过...

llj

5 天以前 a4635e8a0457390b815e582fc9ff76b076e3baf6

在工序出站汇报单维护模块研究下或与过滤条件，在高级自定义过滤中做就行。 现在条件过滤都是单一的，比如根据车间过滤一次性只能过滤查询一个车间的数据，通过添加或与查询方式实现同时过滤查询多个车间的数据。 同时评估下是否能把高级自定义过滤封装到js文件中，页面引用js文件就能实现高级自定义过滤的显示与过滤功能

 WebTM/filterRowTemplate.html

New file
@@ -0,0 +1,99 @@

<div class="layui-row" style="margin-top:5px">
    <div class="layui-inline">
        <label class="layui-form-label" id="BT_ColName">过滤</label>
        <div class="layui-input-block">
            <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;"></select>
        </div>
    </div>
    <div class="layui-inline">
        <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
            <option value="0" selected="selected"></option>
            <option value="=">=</option>
            <option value=">=">>=</option>
            <option value=">">></option>
            <option value="<="><=</option>
            <option value="<"><</option>
            <option value="<>"><></option>
            <option value="7">包含</option>
            <option value="8">左包含</option>
            <option value="9">右包含</option>
            <option value="10">不包含</option>
            <option value="为空">为空</option>
        </select>
    </div>
    <div class="layui-inline">
        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
    </div>
    <div class="layui-inline">
        <select name="Logical_judgement" id="Logical_judgement" class="ForFilteringSchemes" lay-filter="Logical_judgement" style="width:190px;">
            <option value="0" selected="selected"></option>
            <option value="与">并且</option>
            <option value="或">或者</option>
        </select>
    </div>
</div>
<div class="layui-row" style="margin-top:5px">
    <div class="layui-inline">
        <label class="layui-form-label" id="BT_ColName1">过滤</label>
        <div class="layui-input-block">
            <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
            <option value="0" selected="selected"></option>
            <option value="=">=</option>
            <option value=">=">>=</option>
            <option value=">">></option>
            <option value="<="><=</option>
            <option value="<"><</option>
            <option value="<>"><></option>
            <option value="7">包含</option>
            <option value="8">左包含</option>
            <option value="9">右包含</option>
            <option value="10">不包含</option>
            <option value="为空">为空</option>
        </select>
    </div>
    <div class="layui-inline">
        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
    </div>
    <div class="layui-inline">
        <select name="Logical_judgement1" id="Logical_judgement1" class="ForFilteringSchemes" lay-filter="Logical_judgement1" style="width:190px;">
            <option value="0" selected="selected"></option>
            <option value="与">并且</option>
            <option value="或">或者</option>
        </select>
    </div>
</div>
<div class="layui-row" style="margin-top:5px">
    <div class="layui-inline">
        <label class="layui-form-label" id="BT_ColName2">过滤</label>
        <div class="layui-input-block">
            <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
            </select>
        </div>
    </div>
    <div class="layui-inline">
        <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
            <option value="0" selected="selected"></option>
            <option value="=">=</option>
            <option value=">=">>=</option>
            <option value=">">></option>
            <option value="<="><=</option>
            <option value="<"><</option>
            <option value="<>"><></option>
            <option value="7">包含</option>
            <option value="8">左包含</option>
            <option value="9">右包含</option>
            <option value="10">不包含</option>
            <option value="为空">为空</option>
        </select>
    </div>
    <div class="layui-inline">
        <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
    </div>
</div>


 WebTM/layuiadmin/SetColumn.js

@@ -734,3 +734,123 @@
    }
    return count;
}


function buildFilterWhere(colName, comparator, colContent, Logical_judgement, sWhere) {
    if (!colName || !comparator || comparator === "0") return "";
    else if (sWhere == "") {
        var com = "";
        switch (comparator) {
            case "7":
                com = "like''%" + colContent + "%''";
                break;
            case "8":
                com = "like''%" + colContent + "''";
                break;
            case "9":
                com = "like''" + colContent + "%''";
                break;
            case "10":
                com = "not like''%" + colContent + "%''";
                break;
            default:
                com = "" + comparator + "''" + colContent + "''";
                break;
        }
        return " and " + "("+colName + " " + com ;
    }
    else if (sWhere != "")
    {
        var com = "";
        switch (comparator) {
            case "7":
                com = "like''%" + colContent + "%''";
                break;
            case "8":
                com = "like''%" + colContent + "''";
                break;
            case "9":
                com = "like''" + colContent + "%''";
                break;
            case "10":
                com = "not like''%" + colContent + "%''";
                break;
            default:
                com = "" + comparator + "''" + colContent + "''";
                break;
        }
        return Logical_judgement === "或" ? " or " + colName + " " + com + ")" : " and " + colName + " " + com + ")";
    }
    else {

        var com = "";
        switch (comparator) {
            case "7":
                com = "like''%" + colContent + "%''";
                break;
            case "8":
                com = "like''%" + colContent + "''";
                break;
            case "9":
                com = "like''" + colContent + "%''";
                break;
            case "10":
                com = "not like''%" + colContent + "%''";
                break;
            default:
                com = "" + comparator + "''" + colContent + "''";
                break;
        }
        return " and " + colName + " " + com;

    }

}
function fixParenthesesMatching(swhere) {
    const keywordEndPositions = [];
    const keywordRegex = /\b(and|or)\b/gi;
    let match;
    while ((match = keywordRegex.exec(swhere)) !== null) {
        keywordEndPositions.push(match.index + match[0].length);
    }
    keywordEndPositions.sort((a, b) => a - b); 

 
    let leftCount = 0;
    const insertPositions = [];
    const workingKeywordPositions = [...keywordEndPositions]; 

    for (let i = 0; i < swhere.length; i++) {
        if (swhere[i] === '(') {
            leftCount++;
        } else if (swhere[i] === ')') {
            leftCount--;
 
            if (leftCount < 0) {

                let insertIndex = -1;
                for (let j = workingKeywordPositions.length - 1; j >= 0; j--) {
                    if (workingKeywordPositions[j] < i) {
                        insertIndex = workingKeywordPositions[j];
                        workingKeywordPositions.splice(j, 1); 
                        break;
                    }
                }
  
                insertPositions.push(insertIndex !== -1 ? insertIndex : 0);
                leftCount = 0; 
            }
        }
    }

    let result = swhere;
    insertPositions
        .sort((a, b) => b - a) 
        .forEach(pos => {
            result = result.slice(0, pos) + '(' + result.slice(pos);
        });

    return result;
}



 WebTM/layuiadmin/modules/dropdown-disable.js

New file
@@ -0,0 +1,40 @@
layui.define(['jquery', 'form'], function (exports) {


    var $ = layui.$;
    var form = layui.form;

    var DropdownDisable = {
        init: function (options) {
            var dropdownSelector = options.dropdown;
            var inputSelector = options.input;
            var filter = options.filter;
            var disableValue = options.disableValue || "为空";

            var $dropdown = $(dropdownSelector);
            var $input = $(inputSelector);

            if (!$dropdown.length || !$input.length || !filter) return;

            form.on('select(' + filter + ')', function (data) {
                DropdownDisable._updateInput($input, data.value === disableValue);
            });

            DropdownDisable._updateInput($input, $dropdown.val() === disableValue);
        },

        _updateInput: function ($input, disabled) {
            if (disabled) {
                $input.prop('disabled', true)
                    .addClass('layui-disabled')
                    .attr('placeholder', '已禁用输入');
            } else {
                $input.prop('disabled', false)
                    .removeClass('layui-disabled')
                    .attr('placeholder', '请输入内容');
            }
        }
    };

    exports('dropdownDisable', DropdownDisable);
});

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -141,87 +141,8 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" id="BT_ColName">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" id="BT_ColName1">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" id="BT_ColName2">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                    <div id="filter-row"> <!--过滤框html-->                                       
                                    </div>  
                                </div>
                            </div>
                        </div>
@@ -326,7 +247,8 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableFilter'], function () {
            dropdownDisable: 'dropdown-disable'//下拉框禁用联动模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -361,7 +283,7 @@
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//需要设置的按钮的父级节点的id


            var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "选择", "查询日期", "成本对象", "成本对象名称", "HBillStatus", "HBillType", "流转卡组织", "HCenterID", "HbillSubType", "HPRDORGID", "生产订单业务类型", "工序工价", "工价","金额","设备清单","单据类型"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "选择", "查询日期", "成本对象", "成本对象名称", "HBillStatus", "HBillType", "流转卡组织", "HCenterID", "HbillSubType", "HPRDORGID", "生产订单业务类型", "工序工价", "工价", "金额", "设备清单", "单据类型"];//不需要显示的字段 å¯æ‰©å±•

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

@@ -389,7 +311,28 @@

            //初始化界面
            set_ClearBill();

            //下拉框禁用联动
            layui.use(['form', 'dropdownDisable'], function () {
                var dropdownDisable = layui.dropdownDisable;
                dropdownDisable.init({
                    dropdown: '#Comparator',
                    input: '#ColContent',
                    filter: 'Comparator', // lay-filter åç§°
                    disableValue: '为空'
                });
                dropdownDisable.init({
                    dropdown: '#Comparator1',
                    input: '#ColContent1',
                    filter: 'Comparator1', // lay-filter åç§°
                    disableValue: '为空'
                });
                dropdownDisable.init({
                    dropdown: '#Comparator2',
                    input: '#ColContent2',
                    filter: 'Comparator2', // lay-filter åç§°
                    disableValue: '为空'
                });
            });
            //日期间隔下拉列表监听
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -430,7 +373,7 @@
                    get_FastQuery();
                }
                //initFunction(1, HModName, sessionStorage["HTranSlate"]);
            });            
            });

            //#region å›žè½¦æŸ¥è¯¢

@@ -522,9 +465,9 @@
                check_row(obj);
                var datas = obj.data; //获得当前行数据
                var HMainID = datas.hmainid;
             
                SelectTechParam(HMainID,"TechParam");//工艺参数
                SelectTechParam(HMainID,"Note");    //操作日志

                SelectTechParam(HMainID, "TechParam");//工艺参数
                SelectTechParam(HMainID, "Note");    //操作日志
                SelectTechParam(HMainID, "SN");    //SN序列码
                SelectTechParam(HMainID, "Emp");    //操作员清单
                SelectTechParam(HMainID, "Sup");    //供应商清单
@@ -583,7 +526,7 @@
                switch (obj.event) {
                    //删除
                    case 'btn-Delete5': btn_Delete5();
                        break;                   
                        break;
                };
            });

@@ -617,16 +560,16 @@
            });

            //查询工艺参数
            function SelectTechParam(HMainID,TableName) {
            function SelectTechParam(HMainID, TableName) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_SubDisplay',
                    type: "GET",
                    data: { "sWhere": HMainID, "TableName": TableName},
                    data: { "sWhere": HMainID, "TableName": TableName },
                    async: false,
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray = ["生产数量", "工价", "金额", "任务数量", "数量", "出站数量", "报废数量", "不良数量", "工时", "流转卡数量","任务单数量"];
                            var totalArray = ["生产数量", "工价", "金额", "任务数量", "数量", "出站数量", "报废数量", "不良数量", "工时", "流转卡数量", "任务单数量"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
@@ -680,14 +623,14 @@
                                case "Note":

                                    //动态显示列名
                                      option2 = {
                                    option2 = {
                                        elem: '#mainTable2'
                                        , toolbar: '#toolbarDemo2'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                          , page: true
                                          , totalRow: true
                                        , page: true
                                        , totalRow: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
@@ -699,14 +642,14 @@
                                case "SN":

                                    //动态显示列名
                                      option3 = {
                                    option3 = {
                                        elem: '#mainTable3'
                                        , toolbar: '#toolbarDemo3'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                          , page: true
                                          , totalRow: true
                                        , page: true
                                        , totalRow: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
@@ -719,14 +662,14 @@
                                case "Emp":

                                    //动态显示列名
                                     option4 = {
                                    option4 = {
                                        elem: '#mainTable4'
                                        , toolbar: '#toolbarDemo4'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                         , page: true
                                         , totalRow: true
                                        , page: true
                                        , totalRow: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
@@ -785,9 +728,13 @@
                    }
                });
            }

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $.get("../../../filterRowTemplate.html", function (data) {
                    $("#filter-row").html(data);
                    ColFilter(); // é‡æ–°ç”Ÿæˆä¸‹æ‹‰é€‰é¡¹
                    layui.form.render(); // æ¸²æŸ“表单控件
                });
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
@@ -841,9 +788,9 @@
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称', width: 125 }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '出站数量', title: '出站数量', totalRow: true}
                        , { field: '不良数量', title: '不良数量', totalRow: true}
                        , { field: '报废数量', title: '报废数量', totalRow: true}
                        , { field: '出站数量', title: '出站数量', totalRow: true }
                        , { field: '不良数量', title: '不良数量', totalRow: true }
                        , { field: '报废数量', title: '报废数量', totalRow: true }
                        , { field: '包装标识代码', title: '包装标识代码', width: 115 }
                        , { field: '包装标识', title: '包装标识', width: 115 }
                        , {
@@ -876,7 +823,7 @@
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {                       
                    jump: function (obj, first) {
                        //首次不执行
                        if (!first) {
                            //do something
@@ -889,7 +836,7 @@
                }
                laypage.render(optionPage);
            }
          

            //功能按钮是否禁用方法，每次加载表格都要调用
            function btnIs() {
                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮
@@ -900,7 +847,7 @@
                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//保存列宽按钮
                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//默认列宽按钮
                //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//退出按钮        
               

            }


@@ -943,10 +890,10 @@
                    //下推PPM数据录入单
                    case 'btn-SupReport': set_SupReport();
                        break;
                  

                    //退出
                    case 'btn-Exit': get_Exit();
                        break;                
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
@@ -967,10 +914,10 @@
                    //翻译
                    case 'set_FY': initFunction(1, HModName, sessionStorage["HTranSlate"]);
                        break;
                        

                };
            });
           


            //条码删除
            function btn_Delete3() {
@@ -1013,13 +960,13 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.confirm(get_MessageError('[0000-1-003]确定删除吗？', sessionStorage["HTranSlate"]), function (index) {
                        var HInterID = data[0].HInterID;                    
                        var HInterID = data[0].HInterID;
                        var ajaxLoad = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationOutBill/PPMSupDelete',
                            type: "GET",
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    SelectTechParam(HInterID, "Sup");
@@ -1253,10 +1200,10 @@
                        layer.alert(get_MessageError("[0000-1-002]接口请求失败!", sessionStorage["HTranSlate"]), { icon: 5 });
                    }
                })
            //#endregion
            }           
                //#endregion
            }

             //隐藏列设置 å·¥è‰ºå‚æ•°
            //隐藏列设置 å·¥è‰ºå‚æ•°
            function get_HideColumn_TechParam() {
                var colName = "";
                for (var i = 1; i < option1.cols[0].length; i++) {
@@ -1371,10 +1318,10 @@
                })
            }

              //隐藏列设置 æ“ä½œæ—¥å¿—
            //隐藏列设置 æ“ä½œæ—¥å¿—
            function get_HideColumn_Note() {
                var colName = "";
                for (var i = 1; i < option2.cols[0].length  ; i++) {
                for (var i = 1; i < option2.cols[0].length; i++) {
                    colName += option2.cols[0][i]["title"] + ",";
                }

@@ -1486,7 +1433,7 @@
                })
            }

             //隐藏列设置 SN序列码
            //隐藏列设置 SN序列码
            function get_HideColumn_SN() {
                var colName = "";
                for (var i = 1; i < option3.cols[0].length; i++) {
@@ -1730,7 +1677,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //方法所在页面和方法名
                        data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType":"3791"},
                        data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791" },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1764,7 +1711,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //方法所在页面和方法名
                        data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791"},
                        data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791" },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1796,7 +1743,7 @@
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationOutBill/CloseCj_StationOutBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3791"},
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1823,7 +1770,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString(); 
                    var linterid = data[0].hmainid.toString();
                    //var HICMOEntryID = data[0].HICMOEntryID.toString();
                    var OperationType = 2;
                    layer.open({
@@ -1888,17 +1835,17 @@

                    for (var i = 0; i < checkStatus.data.length; i++) {
                        if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
                            HERR += "第" + (i+1) + "行，生产班组或者生产车间，与其余行不一致，不允许合并下推！"
                            HERR += "第" + (i + 1) + "行，生产班组或者生产车间，与其余行不一致，不允许合并下推！"
                        }

                        linterid.push(data[i].hmainid.toString());
                    }

                    if (HERR != "") {
                        layer.msg(HERR,{ time: 3000, })
                        layer.msg(HERR, { time: 3000, })
                        return;
                    }
                   

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
@@ -1924,7 +1871,7 @@
            function set_SupReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length ==1) {               
                if (checkStatus.data.length == 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
@@ -1937,7 +1884,7 @@
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }                        
                        }
                    })
                } else {
                    layer.msg(get_MessageError('[0000-1-015]请选择数据下推！', sessionStorage["HTranSlate"]));
@@ -2054,23 +2001,26 @@
            function set_ClearQuery() {
                $("#HOrgID").val(sessionStorage["OrganizationID"])
                $("#HWorkBillNo").val("");
                $("#HBillNo").val("");              
                $("#HProcExchBillNo").val("");              
                $("#HBillNo").val("");
                $("#HProcExchBillNo").val("");
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HEmpNumber").val("");
                $("#HEmpName").val("");
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));           
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0"); $("#ColContent1").val("");
                $("#Logical_judgement").val("0");
                $("#ColName1").val("0");
                $("#Comparator1").val("0"); $("#ColContent2").val("");
                $("#Logical_judgement1").val("0");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
               
                $("#Logical_judgement2").val("0");

                form.render('select');
                sWhere = "";
            }
@@ -2095,83 +2045,26 @@
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val();
                var Logical_judgement = $("#Logical_judgement").val();
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val();
                var ColContent1 = $("#ColContent1").val();
                var Logical_judgement1 = $("#Logical_judgement1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                var Logical_judgement2 = $("#Logical_judgement2").val();
                var HNumber = $("#HNumber").val(); //产品代码 å³ç‰©æ–™ç¼–码
                var HName = $("#HName").val(); //当前工序
                var HEmpNumber = $("#HEmpNumber").val(); //操作员代码
                var HEmpName = $("#HEmpName").val(); //操作员名称

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere += " and " + ColName+    " "+ com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com = "";
                    switch (Comparator1) {
                        case "7":
                            com = "like''%" + ColContent1 + "%''";
                            break;
                        case "8":
                            com = "like''%" + ColContent1 + "''";
                            break;
                        case "9":
                            com = "like''" + ColContent1 + "%''";
                            break;
                        case "10":
                            com = "not like''%" + ColContent1 + "%''";
                            break;
                        default:
                            com = "" + Comparator1 + "''" + ColContent1 + "''";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                //过滤框过滤
                sWhere += buildFilterWhere(ColName, Comparator, ColContent, Logical_judgement, sWhere);
                sWhere += buildFilterWhere(ColName1, Comparator1, ColContent1, Logical_judgement, sWhere);
                sWhere += buildFilterWhere(ColName2, Comparator2, ColContent2, Logical_judgement1, sWhere);
                //括号匹配
                sWhere=fixParenthesesMatching(sWhere);
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) >= ''" + HBeginDate + "''";
                }
@@ -2222,7 +2115,7 @@
                        default:
                    }
                }
                sWhere += "  and HBillSubType<>''SUB''";            
                sWhere += "  and HBillSubType<>''SUB''";

                sWhere += getOrgIDByUser();//用户关联组织查询过滤     

@@ -2235,7 +2128,7 @@
            //加载网格
            function get_Display(sWhere) {
                //进入页面显示的缓存列表
                var ajaxLoad = layer.load();    
                var ajaxLoad = layer.load();
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
@@ -2284,7 +2177,7 @@
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                            }                                            
                                            }
                                    }
                                }
                            }
@@ -2330,7 +2223,7 @@
                });
                layer.close(wait);
            }

           
            //#region æŸ¥è¯¢-分页
            function get_DisplayPage(sWhere) {
                var wait = layer.load();//遮罩