生产 计划 平台 计划结束日期 可修改 功能优化

yangle

2023-10-16 0d5cf440dc1ce1d7964edc3bccde9c3bd3c2bd7a

生产 计划 平台  计划结束日期 可修改  功能优化

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBill_Add.html

@@ -338,7 +338,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../Baseset/基础资料/Gy_DepartmentList.html", "yes"]
                                , content: ["../../基础资料/公用基础资料/Gy_DepartmentList.html", "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -351,8 +351,8 @@
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HWorkShopID": checkStatus.data[0].HItemID
                                        , "HWorkShopNumber": checkStatus.data[0].HNumber
                                        , "HWorkShopName": checkStatus.data[0].HName
                                        , "HWorkShopNumber": checkStatus.data[0].部门代码
                                        , "HWorkShopName": checkStatus.data[0].部门名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }

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

@@ -190,6 +190,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>上移</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>下移</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>优先级</button>
                                <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_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
@@ -381,6 +382,11 @@
                case 'set_Priority':
                    set_Priority();
                    break;
                //准备排序
                case 'set_ReadyAsc':
                    set_ReadyAsc();
                    break;
                    
            }
        });

@@ -467,6 +473,26 @@
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj); //行内快捷键筛选

            //#region ä¿®æ”¹æ—¶é—´
            var data = obj.data;
            //日计划生产日期
            if (obj.event == 'HPlanEndDate') {
                var field = $(this).data('field');
                laydate.render({
                    elem: this.firstChild
                    , show: true //直接显示  
                    , closeStop: this
                    , done: function (nowDate) {
                        //时间选择完成，行数据更新
                        data[field] = nowDate;
                        obj.update(data);
                    }
                });
            }


            //#endregion
        });

        //锁定
@@ -548,7 +574,6 @@
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text' });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: '生产组织', title: '生产组织', width:150 });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: '物料代码', title: '物料编码', width:150 });
            columns.push({ field: '物料名称', title: '物料名称', width:150 });
            columns.push({ field: '规格型号', title: '规格型号', width:150 });
@@ -558,9 +583,10 @@
            columns.push({field: '日计划数量总量', title: '日计划数量总量', width: 150});//0
            columns.push({ field: '今日之前日计划数量', title: '今日之前日计划数量', width: 150 });//0
            columns.push({ field: '计划开始日期', title: '预计开工日期', width: 150, templet: "<div>{{d.计划开始日期 ==null ?'':layui.util.toDateString(d.计划开始日期, 'yyyy-MM-dd')}}</div>"});
            columns.push({ field: '计划结束日期', title: '计划结束日期', width: 150, event: "HPlanEndDate"});
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间', title: '生产车间', width: 150});
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
           
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });

            columns.push({
@@ -713,7 +739,9 @@
            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', 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({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

            option = {
@@ -979,7 +1007,7 @@
                , area: ['90%', '90%']//大小
                , title: '生产车间列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -989,7 +1017,7 @@
                    }
                    //获取数据
                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//车间id
                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//车间名称
                    $("#HWorkShopIDName").val(checkStatus.data[0].部门名称);//车间名称
                    get_WriteConfigFile();
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
@@ -1025,8 +1053,8 @@
        function get_FastQuery(number) {
            var HWorkShopID = 0;
            var HProdORGID = 0;
            HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (number == 2) {
                HWorkShopID = $("#HWorkShopID").val();//生产车间
                if (HWorkShopID == 0) {
                    return layer.msg("生产车间不能为空!");
                }
@@ -1490,7 +1518,7 @@
                    //超交货期  ä»ç„¶æŽ’程
                    for (var j = 0; j < ds.length; j++) {
                        //判断资源剩余工时，是否大于 ç”Ÿäº§å‘¨æœŸ
                        if (parseFloat(ds[j]["剩余工时"]) > sLeftProdTimes) {
                        if (parseFloat(ds[j]["剩余工时"]) >= sLeftProdTimes) {
                            if (iLeftQty > 0) // ç”Ÿäº§è®¢å•å‰©ä½™æ•°é‡
                            {
                                //在本资源上生产
@@ -2053,6 +2081,11 @@
            table.render(option);
        }

        //准备排序
        function set_ReadyAsc() {

        }

        //保存
        function set_AddNew() {

@@ -2106,7 +2139,7 @@

            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = "["+JSON.stringify(num)+"]";
            var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
            var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];

            var index = layer.load();
            $.ajax({

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

@@ -33,9 +33,9 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">单据号</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="HBillNo" id="HBillNo">
                                        <input type="text" class="layui-input" name="HICOMNo" id="HICOMNo">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
@@ -272,7 +272,7 @@

        //#region å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBillNo = $("#HBillNo").val();
            var HICOMNo = $("#HICOMNo").val();
            var Organization = $("#Organization").val();//采购组织
            var HWorkShopIDName = $("#HWorkShopIDName").val();//生产车间
            var HBTimes = $("#HBTimes").val();//日期
@@ -281,18 +281,18 @@
            var HMaterNumber = $("#HMaterNumber").val();//物料编码
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号

            if (HBillNo) {
                sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
            if (HICOMNo) {
                sWhere += " and ç”Ÿäº§ä»»åŠ¡å•å· like '%" + HICOMNo + "%'";
            }
            if (Organization) {
                sWhere += " and HProdORGID = '" + Organization + "'";
            }
            if (HWorkShopIDName) {
                sWhere += " and ç”Ÿäº§è½¦é—´ = '" + HWorkShopIDName + "'";
                sWhere += " and éƒ¨é—¨åç§° = '" + HWorkShopIDName + "'";
            }
            if (HBTimes != "" && HETimes != "") {
                sWhere += " and æ—¥æœŸ between '" + HBTimes + "' and '" + HETimes + "'  ";
            }
            //if (HBTimes != "" && HETimes != "") {
            //    sWhere += " and æ—¥æœŸ between '" + HBTimes + "' and '" + HETimes + "'  ";
            //}
            if (HMaterName) {
                sWhere += " and ç‰©æ–™åç§° like'%" + HMaterName + "%'";
            }

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

@@ -13,6 +13,12 @@
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
    <style>
        /*树状图点击高亮变色*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
@@ -43,7 +49,7 @@
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
                                <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 1200px; overflow: scroll;"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
                                <div>
@@ -473,6 +479,11 @@
                    elem: '#TreeTable' //默认是点击节点可进行收缩
                    , data: treeTable
                    , click: function (obj) {

                        //高亮变色
                        $(".layui-tree-set").removeClass('layui-tree-set-active');
                        obj.elem.addClass('layui-tree-set-active');

                        var data = obj.data;  //获取当前点击的节点数据
                        TagId = data.id;
                        var sql = "";
@@ -480,7 +491,7 @@
                        if (data.id == "0") {
                            sql = " and æ—¥æœŸ like'%" + HDate + "%'";
                        } else {
                            sql = " and HSourceID='" + data.id + "' and æ—¥æœŸ like'%" + HDate+"%'";
                            sql = " and HSourceID='" + data.id + "' and (日期 like'%" + HDate +"%' or  æ—¥æœŸ is null)";
                        }
                        get_Display(sql);
                    }

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html

@@ -234,6 +234,7 @@
                    , { field: '物料ID', title: '物料ID', hide: true }
                    , { field: '物料编码', title: '物料编码'  }
                    , { field: '物料名称', title: '物料名称' }
                    , { field: '生产资源', title: '生产资源' }
                    , { field: '计划发料数量', title: '计划发料数量' }
                    , { field: '齐套状态', title: '齐套状态' }
                    , { field: '齐套数量', title: '齐套数量' }

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

@@ -628,6 +628,8 @@
            if (HBillSubType == "SUB") {
                //显示工序
                $("#HIDDEN").show();
            } else {
                HBillSubType = "3301";
            }

            //判断是否新增
@@ -1499,7 +1501,7 @@
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "人员列表"  //标题
                                , title: "工作中心列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -1365,6 +1365,12 @@
                            table.render(option);
                        }

                        $(".laytable-cell-" + table.index + "-0-0").css({
                            "height": "25px",
                            "width": "48px;"
                        });
                       

                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);

@@ -1455,6 +1461,11 @@
                            table.render(option2);
                        }

                        $(".laytable-cell-" + table.index + "-0-0").css({
                            "height": "25px",
                            "width": "48px;"
                        });

                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);