三升排产锁定工单功能完善，提料要料导入功能完善，提料报表合计列完善

wtt

2025-05-15 4537b4f7ea3831e38140457174becc7352b4890b

三升排产锁定工单功能完善，提料要料导入功能完善，提料报表合计列完善

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

@@ -3002,8 +3002,10 @@
                                    iRow = i + 1;
                                    //将数据排到网格中
                                    SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);

                                    set_AddNew1(option.data[i]);
                                    //若工单被锁定了跳过保存内容
                                    if (option.data[i]["锁定工单"] == "否") {
                                        set_AddNew1(option.data[i]);
                                    }
                                }
                                bFind = true;
                            }

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

@@ -88,6 +88,9 @@
            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (data) {
                loadIndex = layer.load(2);
            },
            //data: {
            //    "WorkBookName": function () {
            //        return $("#WorkBookName").val();
@@ -108,6 +111,7 @@
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                    layer.close(loadIndex);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }

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

@@ -88,6 +88,9 @@
            url: GetWEBURL() + '/Sc_JIT_ComplementGoodBill/Sc_JIT_ComplementGoodBill_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (data) {
                loadIndex = layer.load(2);
            },
            //data: {
            //    "WorkBookName": function () {
            //        return $("#WorkBookName").val();
@@ -108,6 +111,7 @@
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                    layer.close(loadIndex);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html

@@ -255,23 +255,7 @@
            }
          
            columns.push({
                field: '提料计划合计', title: '提料计划合计', filter: true, templet: function (d) {
                    //console.log(d); // å¾—到当前行数据
                    //console.log(this); // å¾—到表头当前列配置项
                    //console.log(d.LAY_NUM);
                    let sum = 0;

                    // éåŽ†æ•°æ®å¯¹è±¡çš„所有属性
                    for (let key in d) {
                        // æ£€æŸ¥åˆ—名是否符合 isValidDate æ¡ä»¶
                        if (isValidDate(key)) {
                            // å°† null/undefined è½¬ä¸º 0
                            sum += d[key] ? parseFloat(d[key]) : 0;
                        }
                    }

                    return sum; // ä¿ç•™ä¸¤ä½å°æ•°
                } });
                field: '提料计划合计', title: '提料计划合计', filter: true });

            option = {
                elem: '#mainTable'
@@ -323,7 +307,7 @@
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        option.data = addTotalField(result.data);
                        //列设置
                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                        ins = table.render(option);
@@ -475,6 +459,32 @@

            form.render('select');
        }
        function addTotalField(arr) {
            return arr.map(obj => {
                // åˆ›å»ºæ–°å¯¹è±¡ï¼Œé¿å…ä¿®æ”¹åŽŸå¯¹è±¡
                const newObj = { ...obj };

                // è®¡ç®—符合日期格式的字段值的合计
                let total = 0;
                for (const [key, value] of Object.entries(obj)) {
                    if (isValidDate(key)) {
                        // ç¡®ä¿å€¼æ˜¯æ•°å­—类型
                        const numValue = Number(value);
                        if (!isNaN(numValue)) {
                            total += numValue;
                        }
                    }
                }
                // å¤„理浮点数精度问题
                const roundedTotal = parseFloat(total.toFixed(2));

                // æ·»åŠ ææ–™è®¡åˆ’合计字段
                newObj['提料计划合计'] = roundedTotal;

                return newObj;
            });
        }

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