From 75ec3951c8e8cbc3f3e165b0cacd6f65b8d81aa8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 Jan 2025 09:42:45 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettleBillServiceImpl.java       | 54 ++++++++++---------
 .../EmisSettleInvoiceRecordServiceImpl.java   |  2 +-
 2 files changed, 29 insertions(+), 27 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 2aae36d1e..92d50d608 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
@@ -492,11 +492,13 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
         BigDecimal totalMoney = BigDecimal.ZERO;
         // 所有开票金额 = 已开票金额+不开票金额
         BigDecimal totalAllMoney = BigDecimal.ZERO;
+
+        // 已开票金额计算
+        Map<String,BigDecimal>  hasOpenBillMap = new HashMap<String,BigDecimal>();
+
         // 获取运单已经开票记录   // 查询关联的运单表
         List<Map> listRel=emisSettleInvoiceRelMapper.selectHasOpenInvoiceMapList(settleBillNo);
         if(!CollectionUtils.isEmpty(listRel)) {
-
-            Map<String,BigDecimal>  hasOpenBillMap = new HashMap<String,BigDecimal>();
             // 已收款金额list转map
             for (Map mapItem:listRel) {
                 String billNo= MapUtils.getString(mapItem,"billNo",null);
@@ -505,37 +507,37 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
 
                 totalMoney=totalMoney.add(sumMoney);
             }
+        }
 
-            // 获取账单运单列表,重新计算每一单的开票状态
-            List<EmisSettleSubBill> subBillList=emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo);
-            for (EmisSettleSubBill subBill:subBillList) {
-                BigDecimal sumMoney=BigDecimal.ZERO;
-                if(hasOpenBillMap.containsKey(subBill.getBillNo())){
-                    sumMoney=hasOpenBillMap.get(subBill.getBillNo());
-                }
+        // 获取账单运单列表,重新计算每一单的开票状态
+        List<EmisSettleSubBill> subBillList=emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo);
+        for (EmisSettleSubBill subBill:subBillList) {
+            BigDecimal sumMoney=BigDecimal.ZERO;
+            if(hasOpenBillMap.containsKey(subBill.getBillNo())){
+                sumMoney=hasOpenBillMap.get(subBill.getBillNo());
+            }
 
-                EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill();
-                updEmisSettleSubBill.setBillCode(subBill.getBillCode());
-                updEmisSettleSubBill.setInvoicedMoney(sumMoney);
+            EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill();
+            updEmisSettleSubBill.setBillCode(subBill.getBillCode());
+            updEmisSettleSubBill.setInvoicedMoney(sumMoney);
 
-                if(!"3".equals(subBill.getOpenBillStatus())&&!"4".equals(subBill.getOpenBillStatus())) {
-                    if (sumMoney.compareTo(BigDecimal.ZERO) == 0) {
-                        updEmisSettleSubBill.setOpenBillStatus("0");
-                    } else {
-                        if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
-                            updEmisSettleSubBill.setOpenBillStatus("1");
-                        } else {
-                            updEmisSettleSubBill.setOpenBillStatus("2");
-                        }
-                    }
-                    // 更新每一单的开票状态
-                    emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill);
-                }else{
-                    // 如果开票金额大于等于账单金额
+            if(!"3".equals(subBill.getOpenBillStatus())&&!"4".equals(subBill.getOpenBillStatus())) {
+                if (sumMoney.compareTo(BigDecimal.ZERO) == 0) {
+                    updEmisSettleSubBill.setOpenBillStatus("0");
+                } else {
                     if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
                         updEmisSettleSubBill.setOpenBillStatus("1");
+                    } else {
+                        updEmisSettleSubBill.setOpenBillStatus("2");
                     }
                 }
+                // 更新每一单的开票状态
+                emisSettleSubBillMapper.updateOpenBillStatus(updEmisSettleSubBill);
+            }else{
+                // 如果开票金额大于等于账单金额
+                if (sumMoney.compareTo(subBill.getBillFee()) >= 0) {
+                    updEmisSettleSubBill.setOpenBillStatus("1");
+                }
             }
         }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
index e0a2fbd7f..92941f8bc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
@@ -188,7 +188,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
 
         String empName=getCurrentUser().getEmpName();
         String title=empName+"提交了开票申请,开票抬头："+emisSettleInvoiceRecord.getCompanyName()+",开票金额:"+emisSettleInvoiceRecord.getApplyMoney()+",请及时开票！";
-        sendNoticeToEmpUser("padmin,88888042,88888047,88888034", title, "", "/ruyERj/CenterInvoiceRecordDeal");
+        sendNoticeToEmpUser("88888042,88888047,88888034", title, "", "/ruyERj/CenterInvoiceRecordDeal");
 
         return 1;
     }