合并分支

chenhaozhe

2026-04-10 9dc32795c75ee417f45ef3b5b42a005ada0411bf

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldMonthUseReport.html

@@ -260,14 +260,11 @@
                }

                var HCostObjID = $("#HMouldID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var HProcID = $("#HProcID").val() || '0';

                // ä¿®æ”¹ï¼šå­˜å‚¨è¿‡ç¨‹å‚数改为开始年、开始月、结束年、结束月、车间、物料
                var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
                    HEndYear + "','" + HEndPeriod + "','" +
                    HWorkShopID + "','" + HCostObjID + "'" + ",'" + HProcID+"'";
                    HEndYear + "','" + HEndPeriod + "'," +
                    HCostObjID
                sWhere = spParams;

                if (type == 2) {
@@ -275,16 +272,15 @@
                }
            }

            // åŠ è½½é˜¶æ¢¯è®¡ä»¶æ•°æ®
            function get_Display(params) {
                var loadIndex = layer.load(1, { shade: false });

                var sql = "exec h_p_CB_ActualItemMoneyCost" + params;
                var sql = "exec h_p_Sc_MouldMonthUseReport" + params;

                $.ajax({
                    url: GetWEBURL() + '/CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList',
                    url: GetWEBURL() + '/CommonModel/searchMethod',
                    type: "GET",
                    data: { "sWhere": sql },
                    data: { "sql": sql, "user": sessionStorage["HUserName"],"ModRightNameCheck":""},
                    success: function (data1) {
                        layer.close(loadIndex);
                        if (data1.count == 1) {