Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2025-01-21 3f992de7c62461ab2ebef30878d867bcea8c7759

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillListQuery.html

@@ -55,30 +55,17 @@
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 107px;">
@@ -91,6 +78,28 @@
                                            <input type="text" class="layui-input" name="HModel" id="HModel">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">项目号</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

@@ -242,6 +251,26 @@
            var titleData = ["hmainid", "单据类型", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "工作", "HMainProcID", "工序名称", "主运行时间", "运行时间单位", "主加工数量", "材质", "图号版本", "HMainGroupID", "班组", "工价", "标准资源数", "加资源增量", "减资源减量", "HItemID", "HPRDORGID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData2 = ["hmainid", "hsubid", "程序号", "本工序确认记录", "自动移转", "换单准备时间", "本道准备时间", "上道循环周期", "上道固定天数", "开工余量（固数）", "开工余量（天数）", "标准定额", "报废单价", "不合格单价", "工序工价", "班产定额", "可操作设备数", "标准人数", "流转工序", "下道流转工序", "固定生产天数", "生产周期", "暂放区", "周转箱", "周转箱标准", "换模时间", "转移时间", "排队时间", "准备时间", "产线人数", "产线产能", "产线中心", "良率", "加工数量", "运行时间", "时间单位", "图纸编号", "模具编号", "良品仓", "报废品仓", "不良品仓", "工序类型", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "工段", "开工余量天数", "开工余量固数", "累计良率", "超额比例", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "加工单价", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//不需要显示的字段 å¯æ‰©å±•

            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }

            var HMaterID = "";
            var HProID = 0;
            var params = getUrlVars();
            if (params[params[0]] != "undefined") {
                HMaterID = params[params[0]]; //从参数中获取
                HProID = params[params[1]]; //从参数中获取
            }

            var ins;                        //用于导出excel
            //#endregion

@@ -251,7 +280,7 @@
            //初始化界面
            set_ClearBill();
            //初始化表格
            DisPlay_HideColumn();
            //DisPlay_HideColumn();

            //#endregion

@@ -390,8 +419,11 @@
                //初始化表格
                set_InitGrid();
                Organ();
                //查询项目号
                Get_HProject();
                //查询
                get_FastQuery(1);
               
            }
            //#endregion

@@ -422,6 +454,7 @@
                $("#HMaterNumber").val("");//物料
                $("#HModel").val("");//物料
                $("#HOrderProcNO").val("");//单据类型
                $("#HProject").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -454,6 +487,31 @@
                form.render('select');

                $("#HInitTimeCycle").val("29");
            }
            //#endregion

            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="0" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

@@ -710,6 +768,7 @@
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HOrgID = "";
                var HProject = $("#HProject").val();
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                //var HMaterID = $("#HMaterID").val();
                var HMaterName = $("#HMaterName").val();
@@ -791,12 +850,19 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";

                if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
                    //从别的页面打开传入Hmaterid值，设置物料过滤,未关闭
                    sWhere += " and HMaterID = " + HMaterID + " and isnull(审核人,'''')<>'''' ";
                } else {
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                    }
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
@@ -822,6 +888,12 @@
                if (HOrgID) {
                    sWhere += " and HOrgID = '" + HOrgID + "'";
                }
                if (number==2) {
                    if (HProject) {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }
               
                sWhere += " and HBillSubType<>'SUB' ";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存