From 78eb0d0e130e7e16453cd106eba3f43768655534 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 14 十一月 2024 22:26:50 +0800
Subject: [PATCH] 生成条码bug修复；工艺路线列表，名称过滤条件去除换行符；达成率报表总达成率逻辑调整
---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 8 +++++---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 3 ++-
WebTM/views/车间管理/报表分析/Sc_PlanAchievementRateReport.html | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ec3f0fc..bc597b1 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/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'];
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 78ce1ec..194b1c7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/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 + "%''";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
index 9e0f8cc..f68d195 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/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);
}
});
--
Gitblit v1.9.1