添康排产模块，计划导入模块

yusijie

2024-12-17 1109f7bc37b250175103e249fab0446c07c72631

添康排产模块，计划导入模块

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -9,7 +9,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/   //余思杰本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

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

@@ -182,6 +182,7 @@
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var columns = [];
            var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //获取开始日期天数

            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
@@ -210,12 +211,34 @@
            columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            for (var i = 0; i <= (SumMonth - dd); i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })

            var k = 0;//收集循环次数
            var Days = 45;
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
                    MM = 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    HBEGINDATE = 0;
                    k += j;
                    j = 0;
                } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                    HBEGINDATE = 0;
                    MM += 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    k += j;
                    j = 0;
                }
            }
            for (var i = 1; i <= dd; i++) {
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
            }

            //for (var i = 0; i <= (SumMonth - dd); i++) {
            //    columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:80 })
            //}
            //for (var i = 1; i <= dd; i++) {
            //    columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 80 })
            //}
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

            option = {
@@ -232,7 +255,7 @@

            //渲染页面
            table.render(option);
        }
        }      

        //导入(保存)
        function set_AddNew(data) {

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

@@ -26,9 +26,7 @@
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">解锁</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">齐套分析</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">提料运算</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">生产订单选单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">准备</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">排产</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">生产订单选单</button>                           
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">工艺路线</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">添加订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">组装排产</button>
@@ -645,17 +643,21 @@
                    }
                }
                if (HYxjQty > 0) {
                    layer.confirm('当前排产页面存在优先级为0的生产订单，是否继续进行排产？', {
                        title: "操作提示",
                        icon: 0,
                        btn: ['确认', '取消']
                    }, function (index, layero) {
                        //确认
                        set_AddNew();
                    }, function (index) {
                        //取消
                        return
                    });
                    //layer.confirm('当前排产页面存在优先级为0的生产订单，是否继续进行排产？', {
                    //    title: "操作提示",
                    //    icon: 0,
                    //    btn: ['确认', '取消']
                    //}, function (index, layero) {
                    //    //确认
                    //    set_AddNew();
                    //}, function (index) {
                    //    //取消
                    //    return
                    //});
                    //优先级排序
                    set_Priority();

                    set_AddNew();
                } else {
                    set_AddNew();
                }
@@ -835,7 +837,7 @@
            get_FastQuery(1);
            //隐藏勾选字段
            DisPlay_HideColumn();
            get_Display2(sWhere_ICMO);
            //get_Display2(sWhere_ICMO);
        }
        //#endregion

@@ -1097,8 +1099,8 @@
                        set_InitGrid1(field);
                        sWhere = {
                            HORGID: sessionStorage["OrganizationID"]
                            , HBEGINDATE: field
                            , HENDDATE: field
                            , HBEGINDATE: Format($("#HBeginDate").val(), 'yyyy/MM/dd')
                            , HENDDATE: Format($("#HEndDate").val(), 'yyyy/MM/dd')
                        }
                        get_Display_3(JSON.stringify(sWhere));
                    });
@@ -1119,9 +1121,18 @@
                    //    }
                    //})

                    for (var i = 0; i < HBackgroundColorIndex.length;i++) {
                        $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
                    for (var i = 0; i < option.data.length; i++) {
                        if (option.data[i]["优先级"] != 0 && option.data[i]["优先级"] != "" && option.data[i]["HSourceID"] == 0 && (option.data[i]["生产资源"] == "" || option.data[i]["生产资源"] == null)) {
                            $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
                        }
                        if (option.data[i]["优先级"] != 0 && option.data[i]["优先级"] != "" && option.data[i]["HSourceID"] != 0 && option.data[i]["生产资源"] != "" && option.data[i]["小时产能"] == 0) {
                            $("tr[data-index='" + i + "']").attr({ "style": "background:#FCA78E;color:black;" });
                        }
                    }

                    //for (var i = 0; i < HBackgroundColorIndex.length;i++) {
                    //    $("tr[data-index='" + i + "']").attr({ "style": "background:#F74848;color:black;" });
                    //}
                }
            }
        }
@@ -1791,24 +1802,24 @@
                        table.render(option);

                        //获取上方排产列表数据,用于对比下方生产订单列表，将下方生产订单列表相同的数据不显示
                        var compareList = [];
                        for (var i = 0; i < option.data.length; i++) {
                            var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                            compareList.push(temp);
                        }
                        //var compareList = [];
                        //for (var i = 0; i < option.data.length; i++) {
                        //    var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                        //    compareList.push(temp);
                        //}

                        //剔除上方排产列表中已经加入的生产订单
                        var tables = [];
                        for (var i = 0; i < option2.data.length; i++) {
                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                            if ($.inArray(temp, compareList) == -1) {
                                tables.push(option2.data[i]);
                            }
                        }
                        option2.data = tables;
                        ////剔除上方排产列表中已经加入的生产订单
                        //var tables = [];
                        //for (var i = 0; i < option2.data.length; i++) {
                        //    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                        //    if ($.inArray(temp, compareList) == -1) {
                        //        tables.push(option2.data[i]);
                        //    }
                        //}
                        //option2.data = tables;

                        //重新渲染子表2
                        table.render(option2);
                        ////重新渲染子表2
                        //table.render(option2);

                        layer.close(ajaxLoad);
                    } else {
@@ -2940,25 +2951,25 @@
                        option.data = dataPush;
                        table.render(option);

                        //获取上方排产列表数据,用于对比下方生产订单列表，将下方生产订单列表相同的数据不显示
                        var compareList = [];
                        for (var i = 0; i < option.data.length; i++) {
                            var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                            compareList.push(temp);
                        }
                        ////获取上方排产列表数据,用于对比下方生产订单列表，将下方生产订单列表相同的数据不显示
                        //var compareList = [];
                        //for (var i = 0; i < option.data.length; i++) {
                        //    var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                        //    compareList.push(temp);
                        //}

                        //剔除上方排产列表中已经加入的生产订单
                        var tables = [];
                        for (var i = 0; i < option2.data.length; i++) {
                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                            if ($.inArray(temp, compareList) == -1) {
                                tables.push(option2.data[i]);
                            }
                        }
                        option2.data = tables;
                        ////剔除上方排产列表中已经加入的生产订单
                        //var tables = [];
                        //for (var i = 0; i < option2.data.length; i++) {
                        //    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                        //    if ($.inArray(temp, compareList) == -1) {
                        //        tables.push(option2.data[i]);
                        //    }
                        //}
                        //option2.data = tables;

                        //重新渲染子表2
                        table.render(option2);
                        ////重新渲染子表2
                        //table.render(option2);

                        layer.close(ajaxLoad);
                    } else {