报工台右上角添加首检/工序检次数，工单添加计划时间 超产修改背景色，布局css调整，绑定生产资源自动带出用户，班组等基础资料；排产页面小时产能放到物料...

yusijie

2024-04-08 85ba9ee7d366dde25c93763bad12979bca25d2b2

报工台右上角添加首检/工序检次数，工单添加计划时间 超产修改背景色，布局css调整，绑定生产资源自动带出用户，班组等基础资料；排产页面小时产能放到物料信息后面，并提示那一行小时产能不存在；修复首检/工序检 列表过滤方案保存功能；生产汇报单添加必填项控制

 WebTM/layuiadmin/layui/css/ReportPlatform.css

@@ -75,7 +75,7 @@

.topright > dd {
    padding: 0px 10px;
    width: 50%;
    width: 75%;
}

dt, dd {

 WebTM/views/IpadIndex.html

@@ -41,6 +41,10 @@
        var HProQty = [];       //时间点产量
        var HBadQty = [];       //不良数量
        var HBadReason = [];       //不良原因
        var HEmpName = "";      //操作员
        var HManagerName = "";      //负责人
        var HGroupName = "";      //班组

        //注意：选项卡 ä¾èµ– element æ¨¡å—，否则无法进行功能性操作
        layui.config({
            base: '../layuiadmin/' //静态资源所在路径
@@ -88,8 +92,8 @@
                                html1 += '<h1 style="display:none;"><span>资源ID：</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
                                html1 += '<h1><span>设备编号：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
                                html1 += '<h1><span>设备代码：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
                                html1 += '<h1><span>操作员：</span><span id="eqp' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
                                html1 += '<h1><span>生产班组：</span><span id="eqp' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                html1 += '<h1><span>操作员：</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
                                html1 += '<h1><span>生产班组：</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                //html1 += '<h1><span>当前工单：</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
                                //html1 += '<h1><span>产品名称：</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
                                //html1 += '<h1><span>产品规格：</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
@@ -152,6 +156,12 @@
            var eqp = "eqp" + i;                       //获取指定资源样式ID
            var HSourceName = $("#" + eqp + "").html(); //通过样式ID获取html内容(资源)
            HSourceName1 = $("#" + eqp + "").html(); //通过样式ID获取html内容(资源)
            var emp = "HEmpName" + i;                   //获取指定资源样式ID
            var us = "us" + i;                   //获取指定资源样式ID
            var gro = "HGroupName" + i;                   //获取指定资源样式ID
            HEmpName = $("#" + emp + "").html(); //通过样式ID获取html内容(资源ID)
            HManagerName = $("#" + us + "").html(); //通过样式ID获取html内容(资源ID)
            HGroupName = $("#" + gro + "").html(); //通过样式ID获取html内容(资源ID)
            if (HSourceID != "" && HSourceID != null) {
                $('.ctop').removeClass('check');  //删除不同父级clss样式相同的所有元素
                $("#ts" + i + "").addClass('check'); // æ·»åŠ å½“前元素的样式
@@ -172,7 +182,12 @@

                            for (var i = 0; i < LoadData1.length; i++) {
                                var html1 = '';
                                //汇报总数大于计划数量，调整背景色提示
                                if (LoadData1[i].HDateFinishQty > LoadData1[i].HDatePlanQty) {
                                    html1 += '<div class="layui-col-sm12 layui-col-md3" style="background-color:#F595A0;border-radius: 3%;">';
                                } else {
                                html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                }
                                html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
                                html1 += '<dl>';
                                html1 += '<dd class="tcenter">';
@@ -186,7 +201,7 @@
                                html1 += '<h1 style="display:none;"><span>生产订单子ID：</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';


                                html1 += '<h1><span>工单号：</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
                                html1 += '<h1><span>工单号：</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span><span style="margin-left:25px;">日期：</span><span>' + LoadData1[i].计划日期 + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>产品ID：</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
                                html1 += '<h1><span>产品名称：</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
                                html1 += '<h1><span>产品型号：</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
@@ -224,16 +239,17 @@
                            for (var i = 0; i < LoadData2.length; i++) {
                                var html1 = '';
                                html1 += '<div class="layui-col-sm12 layui-col-md12">';
                                html1 += '<dl class="topright">;'
                                html1 += '<dl class="topright">'
                                html1 += '<dt>';
                                html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
                                html1 += '</dt>';
                                html1 += '<dd>';
                                html1 += '<h1><span>当前设备：</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
                                html1 += '<h1><span>当前订单：</span><span>' + LoadData2[i].HSourceBillNo + '</span></h1>';
                                html1 += '<h1><span>物料名称：</span><span>' + LoadData2[i].HMaterName + '</span></h1>';
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData2[i].HPlanQty + '</span></h1>';
                                html1 += '<h1><span>已汇报数量：</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>设备编号：</span><span id="HEquipCode' + (i + 1) + '">' + LoadData2[i].HSourceCode + '</span></h1>';
                                html1 += '<h1><span>当前设备：</span><span id="HEquipName' + (i + 1) + '">' + LoadData2[i].HSourceName + '</span><div style="margin-left:25px;float:right"><span >首检次数：</span><span>' + LoadData2[i].首检次数 + '</span></div></h1>';
                                html1 += '<h1><span>当前订单：</span><span>' + LoadData2[i].HSourceBillNo + '</span><div style="margin-left:25px;float:right"><span >巡检次数：</span><span>' + LoadData2[i].巡检次数 + '</span></div></h1>';
                                html1 += '<h1><span>物料名称：</span><span>' + LoadData2[i].HMaterName + '</span><div style="margin-left:25px;float:right"><span >过程检次数：</span><span>' + LoadData2[i].过程检次数 + '</span></div></h1>';
                                html1 += '<h1><span>计划数量：</span><span>' + LoadData2[i].HPlanQty + '</span><div style="margin-left:25px;float:right"><span >当日点检时间：</span><span>' + '预留' + '</span></div></h1>';
                                html1 += '<h1><span>已汇报数量：</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >最后保养时间：</span><span>' + '预留' + '</span></div></h1>';
                                if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
                                    html1 += '<h1><span>进度：</span><span>0%</span></h1>';
                                }
@@ -999,7 +1015,33 @@
                content: '生产管理/工单/Sc_CurrentTicket.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {

                }                
                },
                success: function (dom, index) {
                    var data = [];
                    data.push({
                        "HEquipName": $("#HEquipName1").text(),
                        "HEquipCode": $("#HEquipCode1").text(),
                        "HICMOBillNo": workcode,
                        "HICMOInterID": HICMOInterID,
                        "HICMOEntryID": HICMOEntryID,
                        "HSourceID": HSourceID1,
                        "HEmpName": HEmpName,
                        "HManagerName": HManagerName,
                        "HGroupName": HGroupName,
                        "HBillType": HBillType,
                        "HSourceInterID": HSourceInterID,
                        "HSourceEntryID": HSourceEntryID,
                        "HSourceBillNo": HSourceBillNo,
                        "HSourceBillType": HSourceBillType
                    });

                    //通过索引获取到当前iframe弹出层
                    var iframe = window['layui-layer-iframe' + index];
                    //调用iframe弹出层内的方法
                    iframe.edit(data);
                },


            });
        }


 WebTM/views/Éú²ú¹ÜÀí/¹¤µ¥/Sc_CurrentTicket.html

@@ -36,10 +36,12 @@
                                    <div style="float:left;margin-left:5%;">
                                        <dl>
                                            <dd>
                                                <h2><span>设备名称</span></h2>
                                                <h3><span>设备编号</span></h3>
                                                <h3><span>设备状态</span></h3>
                                                <h3><span>运行时间</span></h3>
                                                <h2><span style="margin-left:10px;" id="HEquipName"></span></h2>
                                                <h3><span>设备编号:<span style="margin-left:10px;" id="HEquipCode"></span></span></h3>
                                                <h3><span>设备状态:<span style="margin-left:10px;" id="HEquipStatus"></span></span></h3>
                                                <h3><span>运行时间:<span style="margin-left:10px;" id="HWorkTime"></span></span></h3>
                                                <h3><span>当日点检时间:<span style="margin-left:10px;" id="HDotCheckDate"></span></span></h3>
                                                <h3><span>最后保养时间:<span style="margin-left:10px;" id="HMaintainDate"></span></span></h3>
                                            </dd>
                                        </dl>                                        
                                    </div>
@@ -51,42 +53,58 @@
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">å·¥&nbsp;&nbsp;单&nbsp;&nbsp;号</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">å·¥&nbsp;&nbsp;单&nbsp;&nbsp;号:</label>
                                        <span style="margin-left:10px;" id="HICMOBillNo"></span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">当前状态</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">当前状态:</label>
                                        <span style="margin-left:10px;" id="HICMOBillStatus"></span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">产品名称</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">产品名称:</label>
                                        <span style="margin-left:10px;" id="HMaterName"></span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">计划数量</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">计划数量:</label>
                                        <span style="margin-left:10px;" id="HPlanQty"></span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">产品代码</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">产品代码:</label>
                                        <span style="margin-left:10px;" id="HMaterNumber"></span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">汇报总数</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">汇报总数:</label>
                                        <span style="margin-left:10px;" id="HReportQty"></span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">规格型号:</label>
                                        <span style="margin-left:10px;" id="HMaterModel"></span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">领料状态</label>
                                        <span>aaaaaaa</span>
                                        <label class="layui-form-label">领料状态:</label>
                                        <span style="margin-left:10px;" id="HPickMtrlStatus"></span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">首检次数:</label>
                                        <span style="margin-left:10px;" id="HFCheckNum"></span>
                                    </div>
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">过程检次数:</label>
                                        <span style="margin-left:10px;" id="HPrCheckNum"></span>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs4 layui-inline">
                                        <label class="layui-form-label">巡检次数:</label>
                                        <span style="margin-left:10px;" id="HPPCheckNum"></span>
                                    </div>
                                </div>
                            </div>
@@ -99,10 +117,10 @@
                                <div style="margin-left:25%;">
                                    <dl>
                                        <dd>
                                            <h2><span>部门</span></h2>
                                            <h3><span>班组</span></h3>
                                            <h3><span>操作员</span></h3>
                                            <h3><span>负责人</span></h3>
                                            <h2><span>部门<span style="margin-left:10px;" id="HDepName"></span></span></h2>
                                            <h3><span>班组:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
                                            <h3><span>操作员:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
                                            <h3><span>负责人:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
                                        </dd>
                                    </dl>
                                </div>
@@ -114,12 +132,12 @@
                        </div>
                        <div id="bottom" style="width: 100%;height:calc(7vh);">
                            <div class="layui-form-item" style="text-align: center;">
                                <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">保存</button>
                                <!--<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">保存</button>
                                <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">新增</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui<!---btn-radius layui-btn-danger">退出</button>
                                <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>-->
                                <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                            </div>
                        </div>
                    </form>
@@ -128,6 +146,34 @@
        </div>
    </div>
    <script>
        //获取参数
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceEntryID = "";  //源单子内码
        var HSourceBillNo = "";   //源单单号
        var HSourceBillType = "";  //源单类型
        var HEquipName = ""; //设备名称
        var HEquipCode = ""; //设备编号
        var HEmpName = ""; //操作员
        var HManagerName = ""; //负责人
        var HGroupName = ""; //班组

        var edit = function (data) {
            HBillType = data[0].HBillType;
            HSourceInterID = data[0].HSourceInterID;
            HSourceEntryID = data[0].HSourceEntryID;
            HSourceBillNo = data[0].HSourceBillNo;
            HSourceBillType = data[0].HSourceBillType;
            HEquipName = data[0].HEquipName;//设备名称
            HEquipCode = data[0].HEquipCode;//设备编号
            HICMOBillNo = data[0].HICMOBillNo;//生产订单单号
            HICMOInterID = data[0].HICMOInterID;//生产订单主内码
            HICMOEntryID = data[0].HICMOEntryID;//生产订单子内码
            HSourceID = data[0].HSourceID;//生产资源id
            HEmpName = data[0].HEmpName;//操作员
            HManagerName = data[0].HManagerName;//负责人
            HGroupName = data[0].HGroupName;//班组
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -152,8 +198,16 @@
            var HModName = "Sc_CurrentTicket";
            //不需要显示的字段 å¯æ‰©å±• 
            var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","源单子内码","源单类型","单据类型"];
            var HFinishRate = 0; //完成率
            var HQualifiedRate = 0;  //合格率
            //初始化界面
            set_ClearBill();

            $("#HEquipName").text(HEquipName);//设备名称
            $("#HEquipCode").text(HEquipCode);//设备编号
            $("#HEmpName").text(HEmpName);//操作员
            $("#HManagerName").text(HManagerName);//负责人
            $("#HGroupName").text(HGroupName);//班组
            //#endregion

            //#region ã€ä»ªè¡¨ç›˜ã€‘
@@ -163,7 +217,7 @@

            var data1 = [{
                name: "完成率",
                value: 55.55,
                value: HFinishRate.toFixed(2),
            }];

            // æŒ‡å®šå›¾è¡¨çš„配置项和数据
@@ -278,7 +332,7 @@

            var data2 = [{
                name: "合格率",
                value: 85,
                value: HQualifiedRate.toFixed(2),
            }];

            // æŒ‡å®šå›¾è¡¨çš„配置项和数据
@@ -407,8 +461,9 @@
            });

            //退出
            form.on('submit(get_Exit)', function (data) {
                Pub_Close(2);
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });

            //刷新
@@ -434,97 +489,32 @@
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();

                $.ajax({
                    url: GetWEBURL() + '/Sc_MyTicket/list',
                    //h_p_JIT_GetCurrentTicketInfo
                    url: GetWEBURL() + '/Sc_CurrentTicket/list',
                    type: "GET",
                    async: false,
                    data: { "HSourceID": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option_notStart = {
                                elem: '#mainTable_notStart'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_notStart);
                            ins = table.render(option_notStart);

                            option_finish = {
                                elem: '#mainTable_finish'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill1
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_finish);

                            option_proc = {
                                elem: '#mainTable_proc'
                                //, toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data.h_p_Sc_MyICMOWorkBill2
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option_proc);

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "我的工单";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //刷新表格数据
                            //DisPlay_HideColumn();

                    data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
                            $("#HICMOBillNo").text(data.HSourceBillNo);//工单号
                            $("#HICMOBillStatus").text('');//当前状态
                            $("#HMaterNumber").text(data.HMaterNumber);//产品代码
                            $("#HMaterName").text(data.HMaterName);//产品名称
                            $("#HMaterModel").text(data.HModel);//规格型号
                            $("#HPlanQty").text(data.HPlanQty);//计划数量
                            $("#HReportQty").text(data.HRelationQty);//汇报总数
                            $("#HPickMtrlStatus").text('');//领料状态
                            $("#HFCheckNum").text(data.首检次数);//首检次数
                            $("#HPrCheckNum").text(data.过程检次数);//过程检次数
                            $("#HPPCheckNum").text(data.巡检次数);//巡检次数
                            HFinishRate = data.完成率;//完成率
                            HQualifiedRate = data.合格率;//合格率
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Æ½Ì¨¹¦ÄÜÒ³/LineBind.html

@@ -100,9 +100,9 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">生产资源:</label>
                                                <div class="layui-input-block">
                                                    <input type="text" name="HSourceName" id="HSourceName" class="layui-input" style="width:80%;">
                                                    <input type="text" name="HSourceName" id="HSourceName" class="layui-input" placeholder="用户绑定生产资源" style="width:80%;">
                                                    <input type="hidden" name="HSourceCode" id="HSourceCode" class="layui-input" style="width:80%;">
                                                    <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input">
                                                    <input type="hidden" name="HSourceID" id="HSourceID" value="0" class="layui-input">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSource" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -111,8 +111,8 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">负责人:</label>
                                                <div class="layui-input-block">
                                                    <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
                                                    <input type="text" name="HManagerName" id="HManagerName" placeholder="用户绑定保管员" class="layui-input" style="width:80%;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID" value="0" class="layui-input">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HManager" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -121,8 +121,8 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">班组:</label>
                                                <div class="layui-input-block">
                                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="width: 80%;">
                                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="">
                                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" placeholder="用户绑定班组" style="width: 80%;">
                                                    <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -169,8 +169,15 @@
                elem: '#HCreateDate'
                , type: 'datetime'
            });
            //初始化数据
            $("#HUserName").val(sessionStorage["HUserName"]);     //创建人
            $("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
            $("#HSourceID").val(sessionStorage["HSourceID"]);      //生产资源id
            $("#HSourceName").val(sessionStorage["HSource"]);      //生产资源
            $("#HManagerID").val(sessionStorage["HKeeperID"]);      //负责人id
            $("#HManagerName").val(sessionStorage["HKeeper"]);      //负责人
            $("#HGroupID").val(sessionStorage["HGroupID"]);      //生产班组id
            $("#HGroupName").val(sessionStorage["HGroup"]);      //生产班组

            //表头信息生产资源弹窗
            form.on('submit(HSource)', function () {

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -84,7 +84,7 @@
                                            <label class="layui-form-label">班组</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -94,7 +94,7 @@
                                            <label class="layui-form-label">统计员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -1205,15 +1205,15 @@
            //#region éžç©ºéªŒè¯
            function AllowLoadData(sSubStr) {  //非空验证
                var Result = true;
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null || $("#HDeptID").val() == "undefined" || $("#HDeptID").val() == 0) {
                    layer.msg("车间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null || $("#HGroupID").val() == "undefined" | $("#HGroupID").val() == 0) {
                    layer.msg("班组不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null || $("#HGroupID").val() == "undefined" || $("#HEmpID").val() == 0) {
                    layer.msg("统计员不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -749,10 +749,10 @@
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true });
            columns.push({ field: '规格型号', title: '规格型号', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true, edit: 'text' });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 150, sort: true });//0
            columns.push({ field: '计划数量', title: '生产订单数量', width: 150, sort: true });//0
            columns.push({ field: '日计划数量总量', title: '日计划数量总量', width: 150, sort: true });//0
@@ -900,7 +900,6 @@
            columns.push({ field: '订单交货期', title: '订单交货期', width: 150, templet: "<div>{{d.订单交货期 =='1900-01-01' ?'':layui.util.toDateString(d.订单交货期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '订单需求数量', title: '订单需求数量', width: 150, sort: true });
            columns.push({ field: '开工余量', title: '开工余量', width: 150, sort: true });
            columns.push({ field: '小时产能', title: '小时产能', width: 150, sort: true, edit: 'text' });
            columns.push({ field: '生产周期', title: '生产周期', width: 150, sort: true });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>", sort: true });
@@ -917,7 +916,7 @@
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', width: 150, hide: true });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
           
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -1487,6 +1486,7 @@
                }
                HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
            }
           
            $('#HProgressBar').html(`
    <div class="layui-progress" lay-filter="demo-filter-progress">
      <div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1548,6 +1548,13 @@

                        table.render(option);

                        data = table.cache["mainTable"];
                        for (var i = 0; i < data.length; i++) {
                            if (parseFloat(data[i]["小时产能"]) == 0 || parseFloat(data[i]["小时产能"]) == null || parseFloat(data[i]["小时产能"]) == undefined) {
                                return layer.alert("第" + (i + 1) + '行，小时产能未设置，请核对数据。' + '</br>' + '1.物料未添加工艺路线' + '</br>' + '2.工艺路线中未设置小时产能' + '</br>' + '3.生产资源未设置单班工时' + '</br>' + '4.生产资源中绑定工作中心与工艺路线中设置的工作中心不一致');
                            }
                        }
                        
                    } else {
                        //layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillList.html

@@ -357,6 +357,7 @@
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    //h_v_Sb_EquipDotCheckBillList
                    url: GetWEBURL() + '/Sb_EquipDotCheckBill/GetEquipDotCheckBillList',
                    type: "GET",
                    async: false,

 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillList.html

@@ -482,6 +482,7 @@
                var ajaxLoad = layer.load();    
                //进入页面显示的缓存列表
                $.ajax({
                    //h_v_Sc_EquipMaintain
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
                    type: "GET",
@@ -540,7 +541,6 @@

                            //刷新表格数据
                            DisPlay_HideColumn();

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "3901";

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList.html

@@ -447,6 +447,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //h_v_QC_ProcessCheckBill
                    url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
                    type: "GET",
                    async: false,
@@ -581,7 +582,7 @@
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                    sqlWhere += " and " + ColName + " " + com;
                }

                if (HBillNo)

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

@@ -118,7 +118,7 @@
                                            <div class="layui-inline" style="width: 85px;">
                                                <label class="layui-form-label">判定结论</label>
                                                <div class="layui-input-block" style="width:190px;">
                                                    <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
                                                    <select name="HLastResult" id="HLastResult" class="ForFilteringSchemes" lay-verify="HLastResult">
                                                        <option value=""></option>
                                                        <option value="合格">合格</option>
                                                        <option value="不合格">不合格</option>
@@ -649,8 +649,10 @@
            function RoadHBillNo(sqlWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //h_v_QC_FirstPieceCheckBill
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
@@ -859,7 +861,7 @@
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                    sqlWhere += " and " + ColName + " " + com;
                }

                if (HBillNo)