完善代码

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInvoiceController.java

@@ -852,8 +852,9 @@ public class SaleInvoiceController {
                 }
                 // 订单金额
                 BigDecimal orderMoney = BigDecimal.ZERO;
-                for (SaleOrderProduct o : orderProductList) {
-                    BigDecimal amount = o.getTaxAmount() == null ? BigDecimal.ZERO : o.getTaxAmount();
+//                for (SaleOrderProduct o : orderProductList) {
+                for (SaleInvoiceProduct o : productList) {
+                    BigDecimal amount = o.getTaxMoney() == null ? BigDecimal.ZERO : o.getTaxMoney();
                     orderMoney = orderMoney.add(amount);
                 }
                 saleInvoice.setOrderMoney(orderMoney.setScale(2));
@@ -880,7 +881,7 @@ public class SaleInvoiceController {
                 productList.forEach(p->noteList.add(p.getNotes()));
 
                 ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleInvoice.getInvoiceCode()+".xlsx", response),
-                        tempFilePath, 20, noteList, 2, 4);
+                        tempFilePath, 18, noteList, 1, 7);