From 952b06caf08eb4630a2da561e0196ef4e024d65f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 5 May 2025 09:22:24 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettlePayRecordServiceImpl.java       | 14 ++++++++++----
 .../resources/mapper/EmisSettlePayRelMapper.xml    |  7 +++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
index f697c82a1..752bbff84 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
@@ -17,9 +17,7 @@ import java.util.Map;
 import com.xdadan.erp.emis.domain.*;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
-import com.xdadan.erp.emis.mapper.EmisSettleBillMapper;
-import com.xdadan.erp.emis.mapper.EmisSettlePayRelMapper;
-import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper;
+import com.xdadan.erp.emis.mapper.*;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisSettleBillService;
 import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
@@ -30,7 +28,6 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.mapper.EmisSettlePayRecordMapper;
 import com.xdadan.erp.emis.service.IEmisSettlePayRecordService;
 
 /**
@@ -49,6 +46,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
     @Autowired
     private EmisSettlePayRelMapper emisSettlePayRelMapper;
 
+    @Autowired
+    private EmisSettlePayBillRelMapper emisSettlePayBillRelMapper;
+
     @Autowired
     private EmisSettleBillMapper emisSettleBillMapper;
 
@@ -141,6 +141,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         }
 
 
+        // 插入账单和支付单关联关系
+        EmisSettlePayBillRel emisSettlePayBillRel=new EmisSettlePayBillRel();
+        emisSettlePayBillRel.setPayId(payId);
+        emisSettlePayBillRel.setSettleBillNo(emisSettlePayRecord.getSettleBillNo());
+        emisSettlePayBillRelMapper.insertEmisSettlePayBillRel(emisSettlePayBillRel);
+
         // 记录收退款运单号
         List<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList();
         if(!CollectionUtils.isEmpty(listRel)){
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
index 651d1fabc..4b34f2005 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from emis_settle_pay_rel a
          where  del_flag='0'
              AND pay_id IN (
+                    <!--
                     SELECT  x1.pay_id FROM
                         emis_settle_pay_record x1,
                         emis_settle_bill x2
@@ -55,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND x2.del_flag = '0'
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
+                     -->
+                select pay_id from emis_settle_pay_bill_rel espbr where espbr.del_flag='0' and FIND_IN_SET(espbr.settle_bill_no, #{settleBillNo})
             )
             AND a.bill_no IN (
                 select essb.bill_no  from emis_settle_sub_bill essb  where essb.del_flag='0'  and  FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
@@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from emis_settle_pay_rel a
         where  del_flag='0'
              AND pay_id IN (
+                    <!--
                     SELECT  x1.pay_id FROM
                         emis_settle_pay_record x1,
                         emis_settle_bill x2
@@ -75,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         AND x2.del_flag = '0'
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
+
+                     -->
+                select pay_id from emis_settle_pay_bill_rel espbr where espbr.del_flag='0' and FIND_IN_SET(espbr.settle_bill_no, #{settleBillNo})
             )
             AND a.bill_no IN (
                 select essb.bill_no  from emis_settle_sub_bill essb  where essb.del_flag='0'  and  FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})