From 2d135bfe2c5c32862622c91eb3ff9bb62872315a Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Mon, 14 Feb 2022 17:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=94=AE=E6=8F=90=E8=B4=A7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E9=A2=84?=
 =?UTF-8?q?=E5=94=AE=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cowr/ssjygl/stat/sale/OrderStatService.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
index 3bac775..358caab 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
@@ -2755,20 +2755,22 @@ public class OrderStatService {
         row.createCell(a++).setCellValue("客户名称");
         row.createCell(a++).setCellValue("总预售金额（元）");
         row.createCell(a++).setCellValue("总提货金额（元）");
+        row.createCell(a++).setCellValue("总预售余额（元）");
         row.createCell(a++).setCellValue("总提货量（吨）");
 
         Row row2 = sheet.createRow(1);
-        int a2   = 5;
+        int a2   = 6;
 
         for (int i = 0; i < sups.size(); i++) {
             Record s     = sups.get(i);
             row.createCell(a).setCellValue(s.getStr("name"));
 
-            sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 2));
-            a += 3;
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 3));
+            a += 4;
 
             row2.createCell(a2++).setCellValue("预售金额（元）");
             row2.createCell(a2++).setCellValue("已提货金额（元）");
+            row2.createCell(a2++).setCellValue("预售余额（元）");
             row2.createCell(a2++).setCellValue("已提货量（吨）");
         }
 
@@ -2777,6 +2779,7 @@ public class OrderStatService {
         sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2));
         sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3));
         sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4));
+        sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5));
 
         int datalen = list.size();
         int colcnt  = a;
@@ -2791,11 +2794,13 @@ public class OrderStatService {
             int b = 2;
             row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "total_presell_amount"));
             row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "total_presell_pug"));
+            row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "total_presell_amount") - DataUtil.getDefaultByRecord(rec, "total_presell_pug"));
             row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "total_weight"));
 
             for (Record s : sups) {
                 row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsl_" + s.getInt("id")));
                 row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xse_" + s.getInt("id")));
+                row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsl_" + s.getInt("id")) - DataUtil.getDefaultByRecord(rec, "xse_" + s.getInt("id")));
                 row.createCell(b++).setCellValue(DataUtil.getDefaultByRecord(rec, "xsw_" + s.getInt("id")));
             }
 
@@ -2826,7 +2831,7 @@ public class OrderStatService {
             }
         }
 
-        for (int i = 1; i < 30; i++) {
+        for (int i = 1; i < 40; i++) {
             sheet.setColumnWidth(i, 15 * 256);
         }