diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index d5c8d15d..6945d23c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -190,6 +190,10 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { sysCustomerQuote.setCreateBy(loginName); sysCustomerQuote.setCreateTime(DateUtils.getNowDate()); String commonCurrency = sysCustomerQuote.getCommonCurrency(); + //后台获取客户报价编号 + String quoteCode = redisCache.generateBillNo("KHBJ"); + + sysCustomerQuote.setSupplierCode(quoteCode); if (RMB.equals(commonCurrency)){ sysCustomerQuote.setConfirmTax("1"); }else { @@ -202,7 +206,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { return result; } for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildList) { - sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChild.setQuoteId(quoteCode); sysCustomerQuoteChild.setCreateTime(new Date()); sysCustomerQuoteChild.setCreateBy(loginName); sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); @@ -449,12 +453,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public void exportCustomerQuoteOne(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价1.xlsx"; + String fileName = "Vantritek-RMB.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -502,7 +505,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -521,12 +524,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteTwo(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价2.xlsx"; + String fileName = "Vantritek-美元.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -567,7 +569,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -585,12 +587,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteThree(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价3.xlsx"; + String fileName = "Infinity-RMB.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -638,7 +639,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -656,12 +657,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteFour(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价4.xlsx"; + String fileName = "Infinity-美元.xlsx"; + - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -702,7 +703,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价4.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价4.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价1.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价2.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/test.docx b/ruoyi-admin/src/main/resources/static/attachments/test.docx deleted file mode 100644 index e69de29b..00000000 diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html index 4481bff8..8ff4c7cc 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html @@ -371,7 +371,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].materialNum); + sum += parseFloat(value[i].materialNum) || 0; } return "总数量: " + sum; } @@ -387,9 +387,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxPrice); + sum += parseFloat(value[i].taxPrice) || 0; } - return "总含税价格: " +sum; + return "总含税价格: " +sum.toFixed(2); } }, { @@ -398,9 +398,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxPrice); + sum += parseFloat(value[i].noTaxPrice) || 0; } - return "总不含税价格: " +sum; + return "总不含税价格: " +sum.toFixed(2); } }, { @@ -409,9 +409,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxSum); + sum += parseFloat(value[i].taxSum) || 0; } - return "总含税总价: " +sum; + return "总含税总价: " +sum.toFixed(2); } }, { @@ -420,9 +420,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxSum); + sum += parseFloat(value[i].noTaxSum) || 0; } - return "总不含税总价: " +sum; + return "总不含税总价: " +sum.toFixed(2); } }, { @@ -477,7 +477,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].materialNum); + sum += parseFloat(value[i].materialNum) || 0; } return "总数量: " +sum; } @@ -488,9 +488,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxPrice); + sum += parseFloat(value[i].taxPrice) || 0; } - return "总含税价格: " +sum; + return "总含税价格: " +sum.toFixed(2); } }, { @@ -499,9 +499,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxPrice); + sum += parseFloat(value[i].noTaxPrice) || 0; } - return "总不含税价格: " +sum; + return "总不含税价格: " +sum.toFixed(2); } }, { @@ -510,9 +510,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxSum); + sum += parseFloat(value[i].taxSum) || 0; } - return "总含税总价: " +sum; + return "总含税总价: " +sum.toFixed(2); } }, { @@ -521,9 +521,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxSum); + sum += parseFloat(value[i].noTaxSum) || 0; } - return "总不含税总价: " +sum; + return "总不含税总价: " +sum.toFixed(2); } }, { diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html index 54f79498..8404ec3a 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html @@ -56,7 +56,7 @@