生成条码bug修复；工艺路线列表，名称过滤条件去除换行符；达成率报表总达成率逻辑调整

yusijie

2024-11-14 78eb0d0e130e7e16453cd106eba3f43768655534

生成条码bug修复；工艺路线列表，名称过滤条件去除换行符；达成率报表总达成率逻辑调整

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -605,9 +605,11 @@
                    if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
                        table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if ("HPinfan" in table.cache["mainTable"][i]) {
                        if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
                            table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "”").replaceAll(";", "；")
                        }
                    }                    
                }
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                HMaterInfo = table.cache['mainTable'];

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -886,7 +886,8 @@
                    sWhere += " and å•æ®ç±»åž‹ like ''%" + HOrderProcNO + "%''";
                }
                if (HMaterName) {
                    sWhere += "and ç‰©æ–™åç§° like ''%" + HMaterName + "%''";
                    //sWhere += "and ç‰©æ–™åç§° like ''%" + HMaterName + "%''";
                    sWhere += "and REPLACE(物料名称, CHAR(10), '''') like ''%" + HMaterName + "%''";
                }
                if (HMaterNumber) {
                    sWhere += "and  ç‰©æ–™ä»£ç  like ''%" + HMaterNumber + "%''";

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_PlanAchievementRateReport.html

@@ -429,7 +429,7 @@
                                        //计算平均值
                                        var data = $(".layui-table-total div:eq(9)").html();
                                        var trArr = $(".layui-table-body.layui-table-main tr").length * 100;
                                        content = (data / trArr * 100).toFixed(2);
                                        content = ($(".layui-table-total div:eq(8)").html() / $(".layui-table-total div:eq(9)").html() * 100).toFixed(2);
                                        divHtml.html(content);
                                    }
                                });