diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java index b974bf0a..57b38359 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java @@ -647,7 +647,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportInvoiceInfinity(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货发票1.xlsx"; + String fileName = "销售出货发票infinity.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); @@ -688,7 +688,17 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform exportShippingInvoiceDtos.add(exportShippingInvoiceDto); } - + BigDecimal total = BigDecimal.ZERO; + String commonCurrency = sysSalesOrderVo.getCommonCurrency(); + if (StringUtils.isNotEmpty(commonCurrency)){ + // 使用 Optional 来安全处理可能为 null 的情况,并使用 reduce 方法来合计 BigDecimal 值 + total = salesShippingInformationDetails.stream() + .map(detail -> CURRENCY_RMB.equals(commonCurrency) + ? detail.getAllNoTaxRmb() // 如果是人民币,获取人民币字段 + : detail.getAllNoTaxDollar()) // 否则,获取美元字段 + .filter(Objects::nonNull) // 过滤掉可能存在的 null 值 + .reduce(BigDecimal.ZERO, BigDecimal::add); // 合计 BigDecimal 值 + } Map map = new HashMap<>(); @@ -700,6 +710,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform map.put("orderDate",salesShippingInformation.getOrderDate()); map.put("originCountry",salesShippingInformation.getOriginCountry()); map.put("tradeTerms",salesShippingInformation.getTradeTerms()); + map.put("total",total); ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); @@ -721,7 +732,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportInvoiceVantritek(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货发票2.xlsx"; + String fileName = "销售出货发票vantritek.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); @@ -763,8 +774,6 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform } - - Map map = new HashMap<>(); map.put("customerContact",salesShippingInformation.getCustomerContact()); map.put("customerContactAddress",salesShippingInformation.getCustomerContactAddress()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index 50e7ee22..2fa4c2af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -1219,7 +1219,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor * */ @Override public void exportShippingInvoiceOne(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货发票1.xlsx"; + String fileName = "销售出货发票infinity.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); @@ -1306,9 +1306,6 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor exportShippingInvoiceDtos.add(exportShippingInvoiceDto); } - - - Map map = new HashMap<>(); map.put("customerContact",sysSalesShippingInform.getCustomerContact()); map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress()); @@ -1335,7 +1332,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor * */ @Override public void exportShippingInvoiceTwo(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货发票2.xlsx"; + String fileName = "销售出货发票vantritek.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票infinity.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票infinity.xlsx new file mode 100644 index 00000000..69c3da6c Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票infinity.xlsx differ diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票vantritek.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票vantritek.xlsx new file mode 100644 index 00000000..c9fdbca5 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票vantritek.xlsx differ diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html index d17b39b1..fa4bf331 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -70,10 +70,10 @@ - 导出销售出货发票1 + 导出销售出货发票infinity - 导出销售出货发票2 + 导出销售出货发票vantritek