From 1c417dfa382bac33436303669d676e76ec7ef431 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, 17 Oct 2022 22:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=AC=A0=E6=AC=BE=E7=9A=84=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/datasource/vo/DepotHeadVo4List.java   | 20 +++++++++++++++++++
 .../service/depotHead/DepotHeadService.java   | 13 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
index edb9efd7..53a55830 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
@@ -37,6 +37,10 @@ public class DepotHeadVo4List extends DepotHead{
 
     private BigDecimal finishDeposit;
 
+    private BigDecimal needDebt;
+
+    private BigDecimal debt;
+
     public String getProjectName() {
         return projectName;
     }
@@ -156,4 +160,20 @@ public class DepotHeadVo4List extends DepotHead{
     public void setFinishDeposit(BigDecimal finishDeposit) {
         this.finishDeposit = finishDeposit;
     }
+
+    public BigDecimal getNeedDebt() {
+        return needDebt;
+    }
+
+    public void setNeedDebt(BigDecimal needDebt) {
+        this.needDebt = needDebt;
+    }
+
+    public BigDecimal getDebt() {
+        return debt;
+    }
+
+    public void setDebt(BigDecimal debt) {
+        this.debt = debt;
+    }
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 5c1ba682..42454e84 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -1019,7 +1019,18 @@ public class DepotHeadService {
                     if(dh.getOperTime() != null) {
                         dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
                     }
-                    dh.setFinishDebt(accountItemService.getEachAmountByBillId(dh.getId()));
+                    BigDecimal discountLastMoney = dh.getDiscountLastMoney()!=null?dh.getDiscountLastMoney():BigDecimal.ZERO;
+                    BigDecimal otherMoney = dh.getOtherMoney()!=null?dh.getOtherMoney():BigDecimal.ZERO;
+                    BigDecimal deposit = dh.getDeposit()!=null?dh.getDeposit():BigDecimal.ZERO;
+                    BigDecimal changeAmount = dh.getChangeAmount()!=null?dh.getChangeAmount():BigDecimal.ZERO;
+                    //欠款
+                    dh.setNeedDebt(discountLastMoney.add(otherMoney).subtract(deposit.add(changeAmount)));
+                    BigDecimal finishDebt = accountItemService.getEachAmountByBillId(dh.getId());
+                    finishDebt = finishDebt!=null?finishDebt:BigDecimal.ZERO;
+                    //已收欠款
+                    dh.setFinishDebt(finishDebt);
+                    //待收欠款
+                    dh.setDebt(discountLastMoney.add(otherMoney).subtract(deposit.add(changeAmount).add(finishDebt)));
                     dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
                     resList.add(dh);
                 }