报工台修改图标；排产模块增加工艺路线，工厂日历按钮，增加优先级为0的判断提示；隐藏主控台右上角的layui版本信息

yusijie

2023-12-29 7cb55f3673e8a5f8907119d0201a750281a56ef6

报工台修改图标；排产模块增加工艺路线，工厂日历按钮，增加优先级为0的判断提示；隐藏主控台右上角的layui版本信息

 WebTM/views/IpadIndex.html

@@ -1042,7 +1042,7 @@
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-pause imgicon"></span>
                                    <span class="layui-icon layui-icon-play imgicon"></span>
                                    <span class="imgtitle">开工</span>
                                </div>
                            </div>
@@ -1071,7 +1071,7 @@
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-pause imgicon"></span>
                                    <span class="layui-icon layui-icon-read imgicon"></span>
                                    <span class="imgtitle">作业指导书</span>
                                </div>
                            </div>
@@ -1117,7 +1117,7 @@
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-play imgicon"></span>
                                    <span class="layui-icon layui-icon-pause imgicon"></span>
                                    <span class="imgtitle">停工</span>
                                </div>
                            </div>

 WebTM/views/indexMenu.html

@@ -82,7 +82,7 @@
                            <i class="layui-icon layui-icon-screen-full"></i>
                        </a>
                    </li>
                    <li class="layui-nav-item" lay-unselect>
                    <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
                        <a href="javascript:;">
                            <cite>
                                <label name="UserName" id="UserName"></label>
@@ -91,14 +91,13 @@
                        <dl class="layui-nav-child">
                            <dd><a lay-href="set/user/info.html">基本资料</a></dd>
                            <dd><a lay-href="set/user/password.html">修改密码</a></dd>
                            <hr>
                            <dd layadmin-event="logout" style="text-align: center;"><a>退出</a></dd>
                        </dl>
                    </li>

                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
                    </li>
                    </li>-->
                    <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
                        <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
                    </li>

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

@@ -230,7 +230,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>上移</button>
@@ -239,6 +239,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>准备排序</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>选产线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>工艺路线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>工厂日历</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -370,10 +372,10 @@
            obj.tr.find(':checkbox').prop('checked', flag);
            if (flag) {
                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
            } else {
                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                //$(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
            }
            //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
            layui.each(table.cache.mainTable, function (i, l) {
@@ -489,8 +491,14 @@
                case 'set_Souce':
                    set_Souce(data);
                    break;


                //查看工艺路线
                case 'set_Routing':
                    set_Routing();
                    break;
                //工厂日历
                case 'set_Calendar':
                    set_Calendar();
                    break;
            }
        });

@@ -526,7 +534,29 @@
            } else if (table.cache["mainTable"].length == 0) {
                return layer.msg("无数据,无法保存!");
            } else {
                set_AddNew();
                var HYxjQty = 0;
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                   if (table.cache["mainTable"][i] != "") {                       
                      if (parseFloat(table.cache["mainTable"][i]["优先级"]) == 0) {
                          HYxjQty++
                      }                       
                   }
                }
                if (HYxjQty > 0) {
                    layer.confirm('当前排产页面存在优先级为0的生产订单，是否继续进行排产？', {
                        title: "操作提示",
                        icon: 0,
                        btn: ['确认', '取消']
                    }, function (index, layero) {
                        //确认
                        set_AddNew();
                    }, function (index) {
                        //取消
                        return
                    });
                } else {
                    set_AddNew();
                }                
            }
        });

@@ -722,7 +752,6 @@
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150, edit: 'text' });
            columns.push({ field: '昨日数量', title: '昨日数量'});
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });

            columns.push({
@@ -881,6 +910,7 @@
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
            option = {
@@ -2376,7 +2406,7 @@
        function set_AddNew() {

            //删除子表数据 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序
            var num = [];
            var num = [];            
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
@@ -2388,7 +2418,7 @@
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            }           

            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
@@ -2626,6 +2656,98 @@
            });
        }

        //查看工艺路线
        function set_Routing() {
            var checkStatus = table.checkStatus('mainTable');
            var ajaxLoad = layer.load();
            if (checkStatus.data.length != 1) {
                layer.alert("请选择一条数据!");
            } else {
                var TabData = checkStatus.data;
                var HMaterID = TabData[0].HMaterID;
                var HMaterNumber = TabData[0].物料代码;
                var HMaterName = TabData[0].物料名称;
                var HMaterModel = TabData[0].规格型号;
                var HRoutingInterID = 0;//工艺路线主内码
                var HStandardQty = 0; //物料默认工艺路线数量
                //根据物料ID æŸ¥è¯¢å½“前物料是否存在 é»˜è®¤çš„工艺路线
                $.ajax({
                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetRoutingListByMater',
                    type: "GET",
                    data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = data1.data
                            //获取当前选择物料的默认工艺路线 ä¸»å†…码
                            for (let i = 0; i < data.length; i++) {
                                if (data[i].HStandard == 1) {
                                    HRoutingInterID = data[i].HInterID;
                                    HStandardQty++;
                                }
                            }
                            if (HStandardQty > 1) {
                                layer.alert("当前物料存在多个默认工艺路线，请进行调整");
                            } else if (HStandardQty == 0) {
                                layer.alert("当前物料没有设置默认工艺路线，请前往工艺路线维护页面设置默认工艺路线");
                            } else if (HStandardQty == 1) {
                                layer.open({
                                    type: 2
                                    , area: ['100%', '100%']
                                    , title: '工艺路线-编辑'
                                    , shift: 0//弹出动画
                                    , content: '../../计划管理/工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
                                    , end: function () {
                                        //刷新页面,
                                        location.reload();
                                    }
                                })
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);

                            //当前用户有新增页面
                            if (data1.IsHavingPermissions == 1) {
                                layer.confirm('当前物料没有设置工艺路线,是否跳转至工艺路线新增页面？', function (index) {
                                    layer.open({
                                        type: 2
                                        , area: ['100%', '100%']
                                        , title: '工艺路线-编辑'
                                        , shift: 0//弹出动画
                                        , content: '../../计划管理/工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
                                        , end: function () {
                                            //刷新页面,
                                            location.reload();
                                        }
                                    })
                                });
                            } else {
                                layer.alert(data1.code + data1.Message, { icon: 5 });
                            }
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
        }

        //设置工厂日历
        function set_Calendar() {
            layer.open({
                type: 2
                , area: ['100%', '100%']
                , title: '工厂日历'
                , shift: 0//弹出动画
                , content: '../../生产管理/生产计划平台/Sc_ShopCalendar.html?OperationType=3'
                , end: function () {
                    //刷新页面,
                    location.reload();
                }
            })
        }

        //排产功能
        function set_Arrangement() {
            var checkStatus = table.checkStatus('mainTable_ICMO')

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

@@ -56,6 +56,7 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" 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="btn_Exit" id="btn_Exit" style="padding:0 5px">退出</button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                            </div>
                        </div>
@@ -105,6 +106,10 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree

            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑 4添加子工艺路线

            var TagId = "";
            var option1 = [];
            var option2 = [];
@@ -234,7 +239,15 @@
                get_Display_Tree(sWhere);
                get_Display("");
            });

            
            //退出
            form.on('submit(btn_Exit)', function (data) {
                if (OperationType == 3) {
                    Pub_Close(1);
                } else {
                    Pub_Close(2); 
                }               
            });
            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
@@ -571,7 +584,17 @@
            }
            //#endregion
     

            //获取参数
            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;
            }
          
            //以上是layui模块
        });

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

@@ -509,7 +509,7 @@
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HProcNo', title: '流水号', edit: 'text' }
                      // , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    // , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    , { field: '工序', title: '工序', edit: 'text', event: "CheckHProcID" }//f7
                    , { field: '工作中心代码', title: '工作中心代码', edit: 'text', event: "CheckHCenterID" }//不填
                    // , { field: 'HCenterID', title: '工作中心id', hide: true }//, hide: true
@@ -543,7 +543,7 @@
                    //, { field: 'HQCSchemeID_Patrol', title: '巡检检验方案ID', hide: true }//f7
                    //, { field: 'HQCSchemeNumber_Patrol', title: '巡检检验方案代码', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
                    //, { field: 'HQCSchemeName_Patrol', title: '巡检检验方案名称', width: 125}//f7
                   

                    //, { field: 'HPassRate', title: '良率', edit: 'text' }//默认
                    //, { field: 'HProcID_S', title: '工段', edit: 'text' }
                    ////, { field: 'HCenterID_S', title: '产线中心id', hide: true }//hide: true
@@ -625,6 +625,30 @@
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var HBillSubType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
            //var linteridSub = params[params[3]];  //从参数获取 å­è¡¨çº§åˆ«
            var IsHavingPermissions = 0; //排产页面跳转过来时判断用户是否有工艺路线编辑权限,0代码没有权限，1代表有权限
            //排产页面跳转编辑查看工艺路线
            if (HBillSubType == 4610 && OperationType == 3) {
                HBillSubType = 3301
                IsHavingPermissions = params[params[3]];
                if (IsHavingPermissions == 0) {
                    //没有工艺路线的编辑权限，禁用按钮
                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                    $('#set_CancelCloseBill').addClass("layui-btn-disabled").attr("disabled", true);
                }
            }
            //排产页面跳转新增工艺路线
            if (HBillSubType == 4610 && OperationType == 1) {
                HBillSubType = 3301

                $("#HMaterID").val(params[params[3]]);//物料ID

                $("#HMaterNumber").val(getParams("HMaterNumber"));//物料代码
                $("#HMaterName").val(getParams("HMaterName"));//物料名称
                $("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//规格型号
            }

            if (HBillSubType == "SUB") {
                //显示工序
@@ -923,19 +947,19 @@
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break; 
                        break;
                    //上一行
                    case 'btn_up':
                        btn_up(data);
                        break; 
                        break;
                    //下一行
                    case 'btn_under':
                        btn_under(data);
                        break; 
                        break;
                    //刷新流水号
                    case 'btn_Refresh':
                        btn_Refresh(data);
                        break; 
                        break;
                }
            });

@@ -1391,7 +1415,7 @@
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length ==0) {
                                    if (checkStatus.data.length == 0) {
                                        return layer.msg("请至少选择一条数据!");
                                    }

@@ -1408,7 +1432,7 @@
                                            NowNum = i + 1;
                                        }
                                    }
                                 

                                    //查询工作中心的数据
                                    var WorkCente = [];
                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½œä¸­å¿ƒä»£ç , isnull(a.HName,'') å·¥ä½œä¸­å¿ƒåç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
@@ -1483,7 +1507,7 @@
                                    //var HCenterID = 0;
                                    //var HCenterNUmber = "";
                                    //var HCenterName = "";
                                   


                                    ////更新表格缓存的数据
                                    //obj.update({
@@ -1673,7 +1697,7 @@
                                        , "HQCSchemeNumber_Fst": checkStatus.data[0].检验方案代码
                                        , "HQCSchemeName_Fst": checkStatus.data[0].方案名称
                                    })
                                    

                                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) { }
@@ -1761,7 +1785,7 @@
                            $("input[name='checkboxHStandard']").prop("checked", false);
                        }

                      

                        //主表
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HBillNo": OperationType == 2 ? "" : d.data[0].单据号
@@ -2076,7 +2100,7 @@
            function btn_under(data) {
                if (data.length != 1) {
                    layer.msg("请选择一行数据！");
                } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
                } else if (option.data[option.data.length - 1]["HProcNo"] == data[0]["HProcNo"]) {
                    layer.msg("末行数据无法移动！");
                } else {
                    var tables = [];
@@ -2183,6 +2207,17 @@
                })
            }
            //#endregion
            //将url参数中的中文乱码重新转换成中文
            function getParams(key) {
                var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
                //如果地址栏中出现中文则进行编码    
                var r = encodeURI(window.location.search).substr(1).match(reg);
                if (r != null) {
                    //将中文编码的字符重新变成中文
                    return decodeURI(unescape(r[2]));
                }
                return null;
            };

        });
    </script>