模具上模，下模校验修改；添康三周排产；

yusijie

2025-07-16 d7fa3ba14d4dba7bd65d28eec14361b72f0b22c0

模具上模，下模校验修改；添康三周排产；

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldLowerBillEdit.html

@@ -939,29 +939,31 @@
                    return false;
                }

                for (var i = 0; i < option.data.length; i++) {
                var data = JSON.parse(JSON.stringify(table.cache['mainTable']));

                    if (option.data[i] != "") {
                for (var i = 0; i < data.length; i++) {

                    if (data[i] != "") {

                        //模具不为空
                        if (option.data[i]["HMouldID"] == "0") {
                        if (data[i]["HMouldID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:模具不能为空!");
                            return false;
                        }
                        //生产资源不为空
                        if (option.data[i]["HSourceID"] == "0") {
                        if (data[i]["HSourceID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:生产资源不能为空!");
                            return false;
                        }

                        //生产订单不为空
                        if (option.data[i]["HICMOBillNo"] == "") {
                        if (data[i]["HICMOBillNo"] == "") {
                            layer.msg("第" + (i + 1) + "行:生产订单不能为空!");
                            return false;
                        }

                        //数量不为0
                        if (option.data[i]["HQty"] == "0") {
                        if (data[i]["HQty"] == "0") {
                            layer.msg("第" + (i + 1) + "行:数量不能为0!");
                            return false;
                        }

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit.html

@@ -980,29 +980,31 @@
                    return false;
                }

                for (var i = 0; i < option.data.length; i++) {
                var data = JSON.parse(JSON.stringify(table.cache['mainTable']));

                    if (option.data[i] != "") {
                for (var i = 0; i < data.length; i++) {

                    if (data[i] != "") {

                        //模具不为空
                        if (option.data[i]["HMouldID"] == "0") {
                        if (data[i]["HMouldID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:模具不能为空!");
                            return false;
                        }
                        //生产资源不为空
                        if (option.data[i]["HSourceID"] == "0") {
                        if (data[i]["HSourceID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:生产资源不能为空!");
                            return false;
                        }

                        //生产订单不为空
                        if (option.data[i]["HICMOBillNo"] == "") {
                        if (data[i]["HICMOBillNo"] == "") {
                            layer.msg("第" + (i + 1) + "行:生产订单不能为空!");
                            return false;
                        }

                        //数量不为0
                        if (option.data[i]["HQty"] == "0") {
                        if (data[i]["HQty"] == "0") {
                            layer.msg("第" + (i + 1) + "行:数量不能为0!");
                            return false;
                        }

 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK2.html

@@ -24,8 +24,8 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">锁定</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">解锁</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">齐套分析</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">要料运算</button>
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">齐套分析</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">要料运算</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">提料运算</button>-->
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">添加订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">组装排产</button>
@@ -796,8 +796,8 @@
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150, sort: true, filter: true });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
            columns.push({ field: '锁定工单', title: '锁定工单', width: 105, sort: true, filter: true });//0
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true, hide: true });
            columns.push({ field: '锁定工单', title: '锁定工单', width: 150, sort: true, filter: true });//0
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true, filter: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true, filter: true });
            columns.push({ field: '规格型号', title: '规格型号', width: 150, sort: true, filter: true });
@@ -808,8 +808,8 @@
            columns.push({ field: '昨日数量', title: '昨日数量', filter: true });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID", filter: true });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });
            columns.push({ field: '最早开工日期', title: '最早开工日期', width: 150, templet: "<div>{{d.最早开工日期 ==null ?'':layui.util.toDateString(d.最早开工日期, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, hide: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });            
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '业务状态', title: '业务状态', width: 150, sort: true, hide: true });
            columns.push({ field: '产线入库数量', title: '产线入库数量', width: 150, sort: true, hide: true });
            columns.push({ field: '未排数量', title: '可排数量', width: 150, sort: true, hide: true });
@@ -854,7 +854,7 @@
            columns.push({ field: '今日之前日计划数量', title: '今日之前日计划数量', width: 150, sort: true });//0
            columns.push({ field: '计划开始日期', title: '预计开工日期', width: 150, templet: "<div>{{d.计划开始日期 ==null ?'':layui.util.toDateString(d.计划开始日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '计划结束日期', title: '计划结束日期', width: 150, templet: "<div>{{d.计划结束日期 ==null ?'':layui.util.toDateString(d.计划结束日期, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '最早开工日期', title: '最早开工日期', width: 150, templet: "<div>{{d.最早开工日期 ==null ?'':layui.util.toDateString(d.最早开工日期, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '操作工', title: '操作工', width: 150, edit: 'text', event: "HEmpID" });
            columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
            columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
@@ -1316,7 +1316,7 @@
                    });
                }

                sWorkQty = option.data[i]["小时产能"];
                sWorkQty = option.data[i]["产线总产能"];
                //获取更新计划数量
                if (SDSum > 0) {
                    sPlanQty = sPlanQty - SDSum - HReportQty;
@@ -1374,7 +1374,7 @@
                                });

                                if (dsSub == null || dsSub.length == 0) {
                                    get_HFData(1, i);
                                    //get_HFData(1, i);
                                    continue;//如果没有剩余则 æ‰§è¡Œä¸‹ä¸€ä¸ªç”Ÿäº§è®¢å•
                                }
                                if (dsSub != null)//不加班排程
@@ -1386,9 +1386,11 @@
                                    set_AddNew1(option.data[i]);
                                }
                                bFind = true;

                                break
                            }
                        } else {
                            get_HFData(1, i);
                            //get_HFData(1, i);
                        }
                    }
                }
@@ -1411,11 +1413,61 @@
                        if (sLeftQty > 0) {
                            if (ds[i]["日期"] == grd.cols[0][j].field) //表格的标题上 ä¿å­˜äº†æ—¥æœŸï¼›
                            {
                                //如果时间被 ä¸Šé“余量占用 åˆ™ è·³è¿‡
                                b = false;

                                //if (dsPre != null && dsPre.Tables[0].Rows.Count > 0) {
                                //    for (var m = 0; m < dsPre.Tables[0].Rows.Count; m++)
                                //    {
                                //        if (ds[i]["日期"] < DBUtility.ClsPub.isDate(dsPre.Tables[0].Rows[m]["日期"])) {
                                //            b = true;
                                //        }
                                //    }
                                //}
                                if (b == false) {
                                    if (dsPre != null && ds[i]["日期"] == dsPre[0]["日期"]) {

                                        ////HUseTimes ä¸º ä¸Šé“余量后 å‰©ä½™å·¥æ—¶ã€‚
                                        //if (ds[i]["最大剩余工时"] > dsPre[0]["HUseTimes"]) {
                                        //    if (parseFloat(sLeftQty) > parseFloat(sWorkQty * dsPre[0]["HUseTimes"])) {
                                        //        grd.data[iRow][j] = parseFloat(sWorkQty * (dsPre[0]["HUseTimes"]));
                                        //        sLeftQty = sLeftQty - parseFloat(sWorkQty * (dsPre[0]["HUseTimes"]));
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre[0]["HUseTimes"]);
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //    else {
                                        //        grd.data[iRow][j]= sLeftQty;
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //}
                                        //else //卓力不需要考虑加班，下面的这一段不需要
                                        //{
                                        //    if (sLeftQty > sWorkQty * ds[i]["最大剩余工时"]) {
                                        //        grd.data[iRow][j]= parseFloat(sWorkQty * ds[i]["最大剩余工时"]);
                                        //        sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["最大剩余工时"]));
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = ds[i]["最大剩余工时"];
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //    else {
                                        //        grd.data[iRow][j]= sLeftQty;
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = ds[i]["最大剩余工时"];
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //}
                                    }
                                    else {
                                        var dayWorkQty = sWorkQty * ds[i]["剩余工时"];
@@ -1424,22 +1476,32 @@
                                        if (sLeftQty > dayWorkQty) {
                                            grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
                                            sLeftQty = sLeftQty - dayWorkQty;

                                            //oSub = new ClsGridValues();
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
                                            option.data[iRow]["HLeftTimes"] = ds[i]["最大剩余工时"];
                                            break;
                                            //oSub.HLeftTimes = ds[i]["最大剩余工时"];
                                            //oClsGridValues.Add(oSub);
                                        }
                                        else {
                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
                                            sLeftQty = 0;

                                            //oSub = new ClsGridValues();
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
                                            option.data[iRow]["HLeftTimes"] = ds[i]["最大剩余工时"];
                                            break;
                                            //oSub.HLeftTimes = ds[i]["最大剩余工时"];
                                            //oClsGridValues.Add(oSub);

                                        }
                                    }
                                }
                            }
                        }
                    }

                }

            }
@@ -1452,10 +1514,57 @@
                            if (ds[i]["日期"] == grd.cols[0][j].field) {
                                //如果时间被 ä¸Šé“余量占用 åˆ™ è·³è¿‡
                                b = false;

                                //if (dsPre != null && dsPre.Tables[0].Rows.Count > 0) {
                                //    for (var m = 0; m < dsPre.Tables[0].Rows.Count; m++)
                                //    {
                                //        if (DBUtility.ClsPub.isDate(ds[i]["日期"]) < DBUtility.ClsPub.isDate(dsPre.Tables[0].Rows[m]["日期"])) {
                                //            b = true;
                                //        }
                                //    }
                                //}
                                if (b == false) {
                                    if (dsPre != null && s[i]["日期"] == dsPre[0]["日期"]) {

                                        //if (ds[i]["剩余工时"] > (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]))) {
                                        //    if (sLeftQty > parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])))) {
                                        //        grd.data[iRow][j]= parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])));
                                        //        sLeftQty = sLeftQty - parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])));
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //    else {
                                        //        grd.data[iRow][j]= sLeftQty;
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //}
                                        //else {
                                        //    if (sLeftQty > sWorkQty * ds[i]["剩余工时"]) {
                                        //        grd.data[iRow][j]= parseFloat(sWorkQty * ds[i]["剩余工时"]);
                                        //        sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["剩余工时"]));
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = ds[i]["剩余工时"];
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //    else {
                                        //        grd.data[iRow][j]= sLeftQty;
                                        //        sLeftQty = 0;
                                        //        oSub = new ClsGridValues();
                                        //        oSub.iRow = iRow;
                                        //        oSub.iCol = j;
                                        //        oSub.HLeftTimes = ds[i]["剩余工时"];
                                        //        oClsGridValues.Add(oSub);
                                        //    }
                                        //}
                                    }
                                    else {
                                        var dayWorkQty = sWorkQty * ds[i]["剩余工时"];
@@ -1468,16 +1577,26 @@
                                        if (sLeftQty > dayWorkQty) {
                                            grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
                                            sLeftQty = sLeftQty - dayWorkQty;

                                            //oSub = new ClsGridValues();
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
                                            //option.data[iRow]["HLeftTimes"] = ds[i]["最大剩余工时"];
                                            //option.data[iRow]["HUseTimes"] = ds[i]["剩余工时"];
                                            break;

                                            //oSub.HLeftTimes = ds[i]["剩余工时"];
                                            //oClsGridValues.Add(oSub);
                                        }
                                        else {
                                            grd.data[iRow][grd.cols[0][j].field] = Math.round(sLeftQty * 10) / 10;

                                            //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
                                            sLeftQty = 0;

                                            //oSub = new ClsGridValues();
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
                                            //option.data[iRow]["HLeftTimes"] = ds[i]["最大剩余工时"];
                                            break;
                                            //oSub.HLeftTimes = ds[i]["剩余工时"];
                                            //oClsGridValues.Add(oSub);
                                        }
                                    }
                                }
@@ -1485,6 +1604,7 @@
                        }
                    }
                }

            }
        }
        //#endregion
@@ -2026,25 +2146,10 @@
            var old_date = new Date();
            var data = option.data;//table.cache["mainTable"];

            if ($("#HWorkShopIDName").val().indexOf("组装") !== -1) {
                //根据计划开工日期排序数组
                data.sort(function (a, b) {
                    // é»˜è®¤æ ¹æ®æœ€æ—©å¼€å·¥æ—¥æœŸæŽ’序，最早开工日期相同则按照销售订单审核日期排序
                    if (new Date(a.最早开工日期) == new Date(b.最早开工日期)) {
                        return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
                    }
                    return new Date(a.最早开工日期) - new Date(b.最早开工日期)
                });
            } else {
                //根据计划结束日期排序数组
                data.sort(function (a, b) {
                    // é»˜è®¤æ ¹æ®è®¡åˆ’结束日期排序，计划结束日期相同则按照销售订单审核日期排序
                    if (Format(a.计划结束日期, 'yyyy/MM/dd') == Format(b.计划结束日期, 'yyyy/MM/dd')) {
                        return Format(a.销售订单审核日期, 'yyyy/MM/dd') - Format(b.销售订单审核日期, 'yyyy/MM/dd')
                    }
                    return Format(a.计划结束日期, 'yyyy/MM/dd') - Format(b.计划结束日期, 'yyyy/MM/dd')
                });
            }
            //根据销售订单审核日期排序数组
            data.sort(function (a, b) {
                return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
            });

            for (var i = 0; i < data.length; i++) {
                data[i]["优先级"] = ((i + 1) * 5);

 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_MaterialLevelShorAnalysisReport_TK.html

@@ -75,6 +75,12 @@
                                    <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="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
                                        </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="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -91,6 +97,18 @@
                                                <option value="2">自制</option>
                                                <option value="3">委外</option>
                                            </select>
                                        </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="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" value="" style="width: 60%;display: inline-block;">
                                        </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="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" value="" style="width: 60%;display: inline-block;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
@@ -599,6 +617,9 @@
            var HWorkShopID = $("#HWorkShopID").val();//物料/产品
            var HWorkShopID2 = $("#HWorkShopID2").val();//物料/产品需求车间
            var HMaterClsID = $("#HMaterClsID").val();//物料属性
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单
            var HMaterNumber = $("#HMaterNumber").val();//产品编码
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单
            if (HBEGINDATE > HENDDATE) {
                return layer.msg("开始日期不能小于结束日期!");
            }
@@ -622,8 +643,17 @@
                sWhere += " and T1.HMaterID= " + HMATERIALID + " ";
            } else {
                if (HMATERIALNAME != "") {
                    sWhere += " and (T2.HName like ''%" + HMATERIALNAME + "%'' or T2.HNumber like ''%" + HMATERIALNAME + "%'') ";
                    sWhere += " and T2.HName like ''%" + HMATERIALNAME + "%''";
                }
            }
            if (HSeOrderBillNo != "") {
                sWhere += " and T1.HSeOrderBillNo like''%" + HSeOrderBillNo + "%''";
            }
            if (HMaterNumber != "") {
                sWhere += " and T2.HNumber like''%" + HMaterNumber + "%''";
            }
            if (HICMOBillNo != "") {
                sWhere += " and T1.HICMOBillNo like''%" + HICMOBillNo + "%''";
            }
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
@@ -640,6 +670,9 @@
            $("#HWorkShopID").val("0");
            $("#HWorkShopID2").val("0");
            $("#HMaterClsID").val("0");
            $("#HSeOrderBillNo").val("");//销售订单
            $("#HMaterNumber").val("");//产品编码
            $("#HICMOBillNo").val("");//生产订单
            form.render('select');
            sWhere = "";
        }

 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/ReportPODemandPlanBillList_S_TK.html

@@ -55,10 +55,16 @@
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品编码</label>
                                            <label class="layui-form-label" style="width: 85px;">产品代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                            </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="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="width: 60%;display: inline-block;" >
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
@@ -68,7 +74,7 @@
                                            <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="HSUPPLIERID" name="HSUPPLIERID" id="HSUPPLIERID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HSUPPLIERNAME" name="HSUPPLIERNAME" id="HSUPPLIERNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HSUPPLIERNAME" name="HSUPPLIERNAME" id="HSUPPLIERNAME" value="" style="width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSUPPLIERID" id="btnHSUPPLIERID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
@@ -86,6 +92,18 @@
                                            <label class="layui-form-label" style="width: 85px;">采购订单号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HPURORDERNO" id="HPURORDERNO">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">供应商代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">供应商名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName">
                                            </div>
                                        </div>
                                    </div>
@@ -392,6 +410,10 @@
            var HSUPPLIERID = $("#HSUPPLIERID").val();//供应商
            var HXQD = $("#HXQD").val();//需求单号
            var HPURORDERNO = $("#HPURORDERNO").val();//采购订单号
            var HMaterNumber = $("#HMaterNumber").val();//物料代码
            var HMaterName = $("#HMaterName").val();//物料名称
            var HSupNumber = $("#HSupNumber").val();//供应商代码
            var HSupName = $("#HSupName").val();//供应商名称

            if (HBEGINDATE > HENDDATE) {
                return layer.msg("开始日期不能小于结束日期!");
@@ -416,6 +438,18 @@
            if (HPURORDERNO) {
                sWhere += " and HPOOrderBillNo like''%" + HPURORDERNO + "%'' ";
            }
            if (HMaterNumber != "") {
                sWhere += " and t1.物料代码 like ''%" + HMaterNumber + "%'' ";
            }
            if (HMaterName != "") {
                sWhere += " and t1.物料名称 like ''%" + HMaterName + "%'' ";
            }
            if (HSupNumber != "") {
                sWhere += " and t3.HNumber like ''%" + HSupNumber + "%'' ";
            }
            if (HSupName != "") {
                sWhere += " and t3.HName like ''%" + HSupName + "%'' ";
            }
            //初始化表格
            set_InitGrid();
            get_Display(sWhere);
@@ -434,6 +468,9 @@
            $("#HSUPPLIERNAME").val("");
            $("#HXQD").val("");//需求单号
            $("#HPURORDERNO").val("");//采购订单号
            $("#HMaterNumber").val("");
            $("#HSupNumber").val("");//供应商代码
            $("#HSupName").val("");//供应商名称
            form.render('select');
            sWhere = " where 1=1 ";
        }

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -1819,7 +1819,7 @@
                        $("#HQCSchemeID").val(checkStatus.data[0].hmainid);
                        $("#HQCSchemeName").val(checkStatus.data[0].检验方案名称);
                        get_CheckItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调