From 52a345db9436bffb6a3ba15523dedf8b4a681a8c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 13 Nov 2024 14:22:43 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettleBillServiceImpl.java       | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index fad869333..c3c7cd744 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -501,17 +501,15 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                 updEmisSettleSubBill.setBillCode(subBill.getBillCode());
                 updEmisSettleSubBill.setInvoicedMoney(sumMoney);
 
-                if(sumMoney.compareTo(BigDecimal.ZERO)>0) {
+                if( sumMoney.compareTo(BigDecimal.ZERO) == 0 ){
+                    updEmisSettleSubBill.setOpenBillStatus("0");
+                }else{
                     if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
                         updEmisSettleSubBill.setOpenBillStatus("1");
                     }else {
                         updEmisSettleSubBill.setOpenBillStatus("2");
                     }
                 }
-                else{
-                    updEmisSettleSubBill.setOpenBillStatus("0");
-                }
-
                 // 更新每一单的开票状态
                 emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill);
 
@@ -525,17 +523,16 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
         newBill.setId(oldBill.getId());
         newBill.setInvoicedMoney(totalMoney);
 
-        if(totalMoney.compareTo(BigDecimal.ZERO)>0) {
+        if( totalMoney.compareTo(BigDecimal.ZERO) == 0 ){
+            newBill.setOpenBillStatus("0");
+        }
+        else{
             if (oldBill.getRecMoney().compareTo(totalMoney) > 0) {
                 newBill.setOpenBillStatus("2");
             } else {
                 newBill.setOpenBillStatus("1");
             }
-        }else{
-            newBill.setOpenBillStatus("0");
         }
-
-
         // 更新账单开票状态
         emisSettleBillMapper.updateEmisSettleBill(newBill);
 
@@ -648,17 +645,18 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
 
                     EmisWaybill emisWaybill = new EmisWaybill();
                     emisWaybill.setBillCode(subBill.getBillCode());
-                    if(sumMoney.compareTo(subBill.getBillFee())>0) {
-                        if (totalMoney.compareTo(subBill.getBillFee()) >= 0) {
+
+                    if( sumMoney.compareTo(BigDecimal.ZERO) == 0 ){
+                        emisWaybill.setPaymentStatus("0");
+                    }else{
+                        if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
                             emisWaybill.setPaymentStatus("1");
                         } else {
                             emisWaybill.setPaymentStatus("2");
                         }
-                    }else{
-                        emisWaybill.setPaymentStatus("0");
                     }
-                    emisWaybillMapper.updatePayedStatus(emisWaybill);
 
+                    emisWaybillMapper.updatePayedStatus(emisWaybill);
 
                     EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill();
                     updEmisSettleSubBill.setPaymentStatus(emisWaybill.getPaymentStatus());