Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2025-10-30 d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a

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

@@ -430,25 +430,29 @@
                return layer.msg("拆单数量不能为0!");
            }

            if (SumHQty > (parseInt(obj.data["计划数量"]))) {
            if (SumHQty > (parseInt(obj.data["计划数量"])) && obj.field == "拆单数量") {
                obj.update({
                    "拆单数量": "0"
                    "拆单数量": $(this).prev().text()
                });
                
                obj.tr.find('td[data-field=拆单数量] input').val($(this).prev().text());  // è¿™å¥ä»£ç æ˜¯å¿…要的更新显示内容
                
                return layer.msg("拆单数量大于订单数量!");
            }

            var NowDate = obj.field;
            if (dateHQty > (parseInt(obj.data["计划数量"]))) {
            if (dateHQty > (parseInt(obj.data["拆单数量"]))) {
                obj.update({
                    "日计划数量总量": dateHQty - obj.value,
                    [NowDate]: 0
                });
                return layer.msg("排产数量大于订单数量!")
                obj.tr.find(`td[data-field=${NowDate}] input`).val(0);  // è¿™å¥ä»£ç æ˜¯å¿…要的更新显示内容
                return layer.msg("排产数量大于拆单数量!")
            }

            if (Date.parse(obj.field) > Date.parse(obj.data.计划结束日期)) {
                return layer.msg("排产日期超出计划结束日期!");
            }
            //if (Date.parse(obj.field) > Date.parse(obj.data.计划结束日期)) {
            //    return layer.msg("排产日期超出计划结束日期!");
            //}


            //修改数据
@@ -1759,7 +1763,7 @@
                , page: false
                , cellMinWidth: 90
                , cols: [columns]
                , limit: Number.MAX_VALUE//默认显示全部
                , limit: 5000//默认显示全部
                , contextmenu: {
                    // è¡¨æ ¼å†…容右键菜单配置
                    body: [
@@ -1889,15 +1893,15 @@
                        //列设置
                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                        ins = table.render(option);
                        //var HinterID_S = [];
                        //for (var i = 0; i < data1.data.length; i++) {
                        //    HinterID_S.push(data1.data[i]["hmainid"]);
                        //}
                        var HinterID_S = [];
                        for (var i = 0; i < data1.data.length; i++) {
                            HinterID_S.push(data1.data[i]["hmainid"]);
                        }
                        layer.close(ajaxLoad);
                        //if (HinterID_S.length > 0) {
                        //    get_Display_1(HinterID_S);
                        //    get_Display_2(HinterID_S);
                        //}
                        if (HinterID_S.length > 0) {
                            /*get_Display_1(HinterID_S);*/
                            get_Display_2(HinterID_S);
                        }

                    } else {
                        layer.close(ajaxLoad);
@@ -2894,7 +2898,10 @@
                        SDSum += TableData[i][option.cols[0][j].field];
                    }
                }

                //跳过 é”å®šå·¥å•
                if (option.data[i].锁定工单 == "是") {
                    continue;
                }
                //找到本任务单 å¯ç”¨ç”Ÿäº§èµ„源
                lMainID = option.data[i]["HICMOInterID"];
                sICMOBillNo = option.data[i]["生产订单号"];
@@ -3715,10 +3722,14 @@
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length != 1) {
                        if (checkStatus.data.length == 1) {
                            OptionData[0] = checkStatus.data[0];
                        } else if (checkStatus.data.length == 0) {
                            //等于0时清空生产资源
                            OptionData[0] = { "HItemID": 0, "生产资源名称": "" };
                        } else {
                            return layer.msg("请选择一条数据");
                        }
                        OptionData[0] = checkStatus.data[0];
                        layer.close(index);//关闭弹窗
                    }
                    , end: function () {
@@ -3808,7 +3819,7 @@
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
                        return layer.msg("第" + (i + 1) + "行,拆产数量有误,请重新输入!");
                    }
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) - parseFloat(table.cache["mainTable"][i]["拆单汇报数量"]) > parseFloat(table.cache["mainTable"][i]["计划数量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) > parseFloat(table.cache["mainTable"][i]["计划数量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                        return layer.msg("第" + (i + 1) + "行,排产数量超出订单数量!");
                    }
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;