From 90099ea500801c035229967d02e30d43c989b01f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 11 Sep 2024 17:26:22 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettleInvoiceRecordServiceImpl.java    | 13 -------------
 .../resources/mapper/EmisSettleInvoiceRelMapper.xml |  6 ++++++
 .../resources/mapper/EmisSettlePayRelMapper.xml     |  3 +++
 3 files changed, 9 insertions(+), 13 deletions(-)

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 d5c451f29..baa3bbc14 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
@@ -212,19 +212,6 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
         // 更新账单开票状态
         emisSettleBillMapper.updateEmisSettleBill(newBill);
 
-        // 更新子账单的收款状态
-        // 如果全部付款则更新运单的付款状态
-//        if(rstDif>=0){
-//            List<EmisSettleSubBill> listSubBill=emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo);
-//            for (EmisSettleSubBill subBill:listSubBill) {
-//                EmisWaybill emisWaybill = new EmisWaybill();
-//                emisWaybill.setBillCode(subBill.getBillCode());
-//                emisWaybillMapper.updatePayedStatus(emisWaybill);
-//            }
-//        }
-
-
-
         return  1;
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
index 54d5284c0..b33fb53e6 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
@@ -89,6 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
             )
+            AND EXISTS (
+                select 1 from emis_settle_sub_bill essb  where a.bill_no=essb.bill_no and essb.del_flag='0'  and essb.settle_bill_no=#{settleBillNo}
+            )
     </select>
 
     <select id="selectHasOpenInvoiceMapList" parameterType="String" resultType="map">
@@ -105,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
             )
+            AND EXISTS (
+                select 1 from emis_settle_sub_bill essb  where a.bill_no=essb.bill_no and essb.del_flag='0'  and essb.settle_bill_no=#{settleBillNo}
+            )
         group by bill_no
     </select>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
index 692781215..cb7d505ef 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
@@ -48,6 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
             )
+            AND EXISTS (
+                select 1 from emis_settle_sub_bill essb  where a.bill_no=essb.bill_no and essb.del_flag='0'  and essb.settle_bill_no=#{settleBillNo}
+            )
         group by bill_no
     </select>