修改 生产计划平台

yangle

2022-10-09 b1dbe8d3fef852a9fe0333861292e13c4a1cdf19

修改 生产计划平台

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlanBillEdit.html

@@ -208,9 +208,9 @@
            <option value="1">蓝海实业集团</option>
            <option value="100035">蓝海通讯公司</option>
            <option value="100037">通讯公司本部</option>
            <option value="100038">手机事业部</option>
            <option value="100038">杭州工厂</option>
            <option value="100039">平板事业部</option>
            <option value="100040">蓝海电子公司</option>
            <option value="100040">江山工厂</option>
            <option value="100041">蓝海销售公司</option>
            <option value="100042">香港销售公司</option>
            <option value="100043">蓝海电子商务有限公司</option>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -99,6 +99,7 @@
                                <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_CloseBill"><i class="layui-icon layui-icon-logout"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></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>
                    </form>
@@ -128,6 +129,7 @@
            , util = layui.util
        var sWhere = "";
        var option = [];
        var HModName = "JIT_DayPlanBillList";
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -156,6 +158,10 @@
                    break;
                //下推
                case 'set_TuiBill': set_TuiBill();
                    break;
                //列设置
                case 'set_HideColumn':
                    get_HideColumn();
                    break;
            };
        });
@@ -194,6 +200,8 @@
            set_InitGrid();
            //查询
            get_Display(sWhere);
            //隐藏勾选字段
            DisPlay_HideColumn();
        }
        //#endregion

@@ -521,6 +529,124 @@
            }
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {


                        var dataCol = [];//数据库查询出的列数据
                        var titleData = ["hmainid"];//不需要显示的字段 å¯æ‰©å±•

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

        //#endregion
        //以上是layui模块
    });

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

@@ -354,7 +354,6 @@
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150});
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150 });
            columns.push({ field: '电压/功率/底板', title: '电压/功率/底板', width: 150 });
            columns.push({ field: '优先级', title: '优先级', width:150 });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: '生产组织', title: '生产组织', width:150 });
@@ -362,13 +361,9 @@
            columns.push({ field: '物料代码', title: '物料编码', width:150 });
            columns.push({ field: '物料名称', title: '物料名称', width:150 });
            columns.push({ field: '规格型号', title: '规格型号', width:150 });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
            columns.push({ field: '计量单位', title: '计量单位', width:150 });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width:150 });//0
            columns.push({ field: '计划数量', title: '生产订单数量', width: 150 });//0
            columns.push({ field: '订单可排数量', title: '订单可排数量', width:150 });
            columns.push({ field: '未入库数量', title: '未入库数量', width: 150 });//0
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150 });//0
            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>"});
@@ -513,6 +508,11 @@
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150 });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150 });
            columns.push({ field: 'hmainid', title: '日计划工单主码', width: 150 });
            columns.push({ field: '电压/功率/底板', title: '电压/功率/底板', width: 150 });
            columns.push({ field: '计量单位', title: '计量单位', width: 150 });
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150 });//0
            columns.push({ field: '订单可排数量', title: '订单可排数量', width: 150 });
            columns.push({ field: '未入库数量', title: '未入库数量', width: 150 });//0

            option = {
                elem: '#mainTable'
@@ -568,13 +568,13 @@
                    if (data1.count == 1) {
                        if (data1.data[0]["DayNum"] > 0) {
                            for (var i = 0; i <= data1.data[0]["DayNum"]; i++) {
                                option.cols[0][27 + i]["edit"] = "";
                                option.cols[0][27 + i]["style"] = "    background-color: #e6e6e6";
                                option.cols[0][22 + i]["edit"] = "";
                                option.cols[0][22 + i]["style"] = "    background-color: #e6e6e6";
                            }
                        } else {
                            for (var i = 0; i < 31; i++) {
                                option.cols[0][27 + i]["edit"] = "text";
                                option.cols[0][27 + i]["style"] = "";
                                option.cols[0][22 + i]["edit"] = "text";
                                option.cols[0][22 + i]["style"] = "";
                            }
                        }
                        table.render(option);
@@ -627,7 +627,7 @@
                            //获取日期下标
                            var _numData3 = [];
                            for (var i = 0; i < _numData2.length; i++) {
                                for (var j = 27; j < 58; j++) {
                                for (var j = 22; j < 53; j++) {
                                    if (option.cols[0][j]["field"] == _numData2[i]) {
                                        _numData3[i] = j;
                                        break;
@@ -771,9 +771,14 @@

        //双击跳转齐套分析明细表
        function btnrowDouble(obj) {

            HMainICMOEntryID = obj["HICMOEntryID"];
            HMainICMOInterID = obj["HICMOInterID"];
            HICMOInterID = obj["HInterID"];

            if (HICMOInterID == "" || HICMOInterID == null) {
                return layer.alert("无日计划工单,无法查看!", { icon: 5 });
            }

            layer.open({
                type: 2 //类型
@@ -881,6 +886,18 @@
                        for (var i = 0; i < tableBak.length; i++) {
                            dataPush.push(tableBak[i]);  //将之前的数据存储
                        }

                        for (var i = 0; i < dataPush.length; i++) {
                            if (dataPush[i]["单据号"] == "") {
                                for (var j = 0; j < data1.data.length; j++) {
                                    if (data1.data[j]["源单主内码"] == dataPush[i]["源单主内码"] && data1.data[j]["源单子内码"] == dataPush[i]["源单子内码"]) {
                                        layer.close(ajaxLoad);
                                        return layer.alert("生产明细行重复,重复的生产订单号:" + dataPush[i]["生产订单号"] + ",明细行号:" + dataPush[i]["生产订单明细行号"], { icon: 5 });
                                      
                                    }
                                }
                            }
                        }
                        //存储数据
                        for (var i = 0; i < data1.data.length; i++) {
                            dataPush.push(data1.data[i]);
@@ -890,7 +907,7 @@
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);

 WebTM/views/Éú²ú¹ÜÀí/ÒªÁϼƻ®/JIT_NeedMaterPlanBillEdit.html

@@ -200,9 +200,9 @@
            <option value="1">蓝海实业集团</option>
            <option value="100035">蓝海通讯公司</option>
            <option value="100037">通讯公司本部</option>
            <option value="100038">手机事业部</option>
            <option value="100038">杭州工厂</option>
            <option value="100039">平板事业部</option>
            <option value="100040">蓝海电子公司</option>
            <option value="100040">江山工厂</option>
            <option value="100041">蓝海销售公司</option>
            <option value="100042">香港销售公司</option>
            <option value="100043">蓝海电子商务有限公司</option>

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

@@ -64,7 +64,7 @@
                                        <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="" id="">
                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -274,6 +274,7 @@
            var HMaterNumber = $("#HMaterNumber").val();
            var HComplete = $("#HComplete").val();
            var HPlanDate = $("#HPlanDate").val();
            var HICMOBillNo = $("#HICMOBillNo").val();
         
            if (HMaterID!="0") {
                sWhere += " and ç‰©æ–™ID = '" + HMaterID + "'";
@@ -287,6 +288,9 @@
            if (HPlanDate) {
                sWhere += " and æ—¥è®¡åˆ’日期 = '" + HPlanDate + "'";
            }
            if (HICMOBillNo) {
                sWhere += " and ç”Ÿäº§è®¢å•å· = '" + HICMOBillNo + "'";
            }
            get_Display(sWhere);
            sWhere = "";//调用接口后清空sWhere缓存
        }