排产页面调整

wtt

2025-05-07 4e2f1038ed8d48a057e3a44e0d9a223dca993179

排产页面调整

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EmployeeList.html

@@ -218,8 +218,7 @@

           //加载数据到网格
            //根据页面的打开方式，判断过滤条件是否需要进行额外的添加
            addSWhereByOpenType();
            get_Display(sWhere);
            get_FastQuery();
            

        //#endregion
@@ -999,7 +998,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                var DeptName = params[params[2]];
                if (openType != "undefined") {
                if (typeof (openType) != "undefined") {
                    sWhere += " and ç¦ç”¨æ ‡è®° = ''and å®¡æ ¸äºº !='' ";
                    DeptName = decodeURI(DeptName);//对URI è¿›è¡Œè§£ç 
                    if (DeptName != "undefined") {

 WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html

@@ -27,7 +27,7 @@
                            <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="btnAddICMO" id="btnAddICMO">添加订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</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="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="btnLock" id="btnLock">锁定</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">解锁</button>
@@ -303,13 +303,14 @@
                        <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>
                                <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_ReadyWorkQty"><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_Emp"><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>
@@ -349,6 +350,7 @@
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
        soulTable: '../ext/soulTable'
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
        //#region å…¬ç”¨å˜é‡

@@ -584,6 +586,16 @@
                //准备排序
                case 'set_ReadyAsc':
                    set_ReadyAsc();
                    break;
                //准备同步产能
                case 'set_ReadyWorkQty':
                    layer.confirm('你确定要执行操作吗，请先确保排产数据已保存？', {
                        btn: ['确定', '取消'] //按钮
                        , btn1: function (index, layero) {
                            get_btnReady(data);
                            layer.close(index);
                        }
                    })
                    break;
                //选产线
                case 'set_Souce':
@@ -1025,10 +1037,10 @@
            var ajaxLoad = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Gy_Department/list',
                url: GetWEBURL() + '/Gy_Department/cx',
                type: "GET",
                async: false,
                data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
                data: { "HInterID": HWorkShopID },
                success: function (data1) {
                    if (data1.count == 1) {
                        $("#HWorkShopID").val(HWorkShopID);
@@ -1060,7 +1072,7 @@
            Organ();
            //初始化表格
            set_InitGrid();
            get_FastQuery(1);
            get_FastQuery(2);
            get_FastQuery_ICMO();
        }
        //#region åˆå§‹åŒ–下拉列表 æŽ’产时间
@@ -1762,17 +1774,17 @@
                }
                , done: function (res, page, count) {
                    soulTable.render(this);
                    $('.layui-table thead').on('click', 'th', function () {
                        // èŽ·å–点击的表头的 field å€¼
                        var field = $(this).data('field');
                        set_InitGrid1(field);
                        sWhere = {
                            HORGID: sessionStorage["OrganizationID"]
                            , HBEGINDATE: field
                            , HENDDATE: field
                        }
                        //get_Display_3(JSON.stringify(sWhere));
                    });
                    //$('.layui-table thead').on('click', 'th', function () {
                    //    // èŽ·å–点击的表头的 field å€¼
                    //    var field = $(this).data('field');
                    //    set_InitGrid1(field);
                    //    sWhere = {
                    //        HORGID: sessionStorage["OrganizationID"]
                    //        , HBEGINDATE: field
                    //        , HENDDATE: field
                    //    }
                    //    //get_Display_3(JSON.stringify(sWhere));
                    //});
                    //res.data.forEach(function (item, index) {
                    //    if (data1.data.DataColor != undefined) {
                    //        var sj = data1.data.DataColor;
@@ -2574,10 +2586,10 @@


        //准备
        function get_btnReady() {
            var data = table.cache["mainTable"];
        function get_btnReady(data) {
            /*var data = table.cache["mainTable"];*/
            var HTotalDataList = [[]];

            var ajaxData;
            var index = 0;
            var countEveryGroup = 50;
            for (var i = 0; i < data.length; i++) {
@@ -2585,7 +2597,8 @@
                    return layer.msg("请先进行保存!!")
                }
                if (isNaN(data[i]["HSourceID"])) {
                    return layer.msg("选择生产资源!!")
                    data[i]["HSourceID"] = 0
                    /*return layer.msg("选择生产资源!!")*/
                }

                if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
@@ -2605,22 +2618,26 @@

                HICOMNum = HTotalDataList[t];
                $.ajax({
                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData_SS',
                    async: false,
                    type: "GET",
                    data: { "SWhere": HICOMNum.toString() },
                    success: function (data1) {
                        if (data1.count == 1) {
                            ajaxData = data1.data;
                            for (var i = 0; i < data1.data.length; i++) {
                                for (var j = 0; j < option.data.length; j++) {
                                    if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
                                        option.data[j]["小时产能"] = data1.data[i]["小时产能"];
                                        option.data[j]["HSourceID"] = data1.data[i]["HSourceID"];
                                        option.data[j]["生产资源"] = data1.data[i]["生产资源"];
                                        option.data[j]["生产周期"] = data1.data[i]["生产周期"];
                                        option.data[j]["开工余量"] = data1.data[i]["开工余量"];
                                        option.data[j]["最迟开工日期"] = data1.data[i]["最迟开工日期"];
                                        option.data[j]["最迟完工日期"] = data1.data[i]["最迟完工日期"];
                                        option.data[j]["订单需求数量"] = data1.data[i]["订单需求数量"];
                                        option.data[j]["订单交货期"] = data1.data[i]["订单交货期"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["订单交货期"];

                                        break;
                                    }
                                }
@@ -2670,10 +2687,10 @@
            }

            table.render(option);
            set_Priority();
            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) {
            /*set_Priority();*/
            /*data = table.cache["mainTable"];*/
            for (var i = 0; i < ajaxData.length; i++) {
                if (parseFloat(ajaxData[i]["小时产能"]) == 0 || parseFloat(ajaxData[i]["小时产能"]) == null || parseFloat(ajaxData[i]["小时产能"]) == undefined) {
                    msg += "第" + (i + 1) + '行，小时产能未设置，请核对数据。' + '</br>' + '1.物料未添加工艺路线' + '</br>' + '2.工艺路线中未设置小时产能' + '</br>' + '3.生产资源未设置单班工时' + '</br>' + '4.生产资源中绑定工作中心与工艺路线中设置的工作中心不一致';
                }
            }
@@ -3651,7 +3668,8 @@
                                if (num >= data.length) {
                                    break;
                                }
                                if (option.data[i]["LAY_CHECKED"] == true) {
                                if ($.grep(data, function (item) {
                                    return item.hmainid === option.data[i].hmainid;}).length > 0) {
                                    option.data[i]["HSourceID"] = OptionData[0].HItemID;
                                    option.data[i]["生产资源"] = OptionData[0].生产资源名称;
                                    num += 1;