From 912e578118916d73f693cd01b1c35b4726e0ca4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 29 Nov 2021 23:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=92=8C=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=88=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E6=9C=9F=E6=9C=AB?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/supplier/SupplierService.java | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
index ebf2c7f0..977ae1a8 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -552,6 +552,27 @@ public class SupplierService {
         List<String[]> objects = new ArrayList<String[]>();
         if (null != dataList) {
             for (Supplier s : dataList) {
+                Integer supplierId = s.getId().intValue();
+                String endTime = getNow3();
+                String supType = s.getType();
+                BigDecimal sum = BigDecimal.ZERO;
+                BigDecimal beginNeedGet = s.getBeginNeedGet();
+                if(beginNeedGet==null) {
+                    beginNeedGet = BigDecimal.ZERO;
+                }
+                BigDecimal beginNeedPay = s.getBeginNeedPay();
+                if(beginNeedPay==null) {
+                    beginNeedPay = BigDecimal.ZERO;
+                }
+                sum = sum.add(depotHeadService.findTotalPay(supplierId, endTime, supType))
+                        .subtract(accountHeadService.findTotalPay(supplierId, endTime, supType));
+                if(("客户").equals(s.getType())) {
+                    sum = sum.add(beginNeedGet);
+                    s.setAllNeedGet(sum);
+                } else if(("供应商").equals(s.getType())) {
+                    sum = sum.add(beginNeedPay);
+                    s.setAllNeedPay(sum);
+                }
                 String[] objs = new String[15];
                 objs[0] = s.getSupplier();
                 objs[1] = s.getContacts();
@@ -559,8 +580,13 @@ public class SupplierService {
                 objs[3] = s.getPhoneNum();
                 objs[4] = s.getEmail();
                 objs[5] = s.getFax();
-                objs[6] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
-                objs[7] = s.getAllNeedPay() == null? "" : s.getAllNeedPay().toString();
+                if(("客户").equals(s.getType())) {
+                    objs[6] = s.getBeginNeedGet() == null? "" : s.getBeginNeedGet().toString();
+                    objs[7] = s.getAllNeedGet() == null? "" : s.getAllNeedGet().toString();
+                } else if(("供应商").equals(s.getType())) {
+                    objs[6] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
+                    objs[7] = s.getAllNeedPay() == null? "" : s.getAllNeedPay().toString();
+                }
                 objs[8] = s.getTaxNum();
                 objs[9] = s.getTaxRate() == null? "" : s.getTaxRate().toString();
                 objs[10] = s.getBankName();