From 162e62795e1cb216991d40b9db900c177378b26a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 Aug 2024 10:41:34 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisSettleInvoiceRecordServiceImpl.java | 8 ++++++--
 .../main/resources/mapper/EmisSettlePayRecordMapper.xml  | 9 +++++++++
 2 files changed, 15 insertions(+), 2 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 d35575e40..a02029b67 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
@@ -118,9 +118,11 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
         }
 
         if(emisSettleInvoiceRecord.getApplyMoney().compareTo(totalFee)>0){
-            throw new EmisBizError(EmisBizErrorType.FAIL,"开票金额不可大于总账单金额");
+//            throw new EmisBizError(EmisBizErrorType.FAIL,"开票金额不可大于总账单金额");
         }
 
+        emisSettleInvoiceRecord.setOpenMoneyMax(totalFee);
+
         // id流水号
         String  applySeqNo= WaybillHelper.genApplySeqNo();
         emisSettleInvoiceRecord.setApplySeqNo(applySeqNo);
@@ -160,7 +162,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
         newBill.setId(oldBill.getId());
         newBill.setOpenBillStatus("1");
 
-        // 更新账单收款状态
+        // 更新账单开票状态
         emisSettleBillMapper.updateEmisSettleBill(newBill);
 
         // 更新子账单的收款状态
@@ -174,6 +176,8 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
 //            }
 //        }
 
+
+
         return  1;
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index 34b89a151..7087694f5 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -104,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
+
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
             </if>
@@ -111,6 +112,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
             </if>
 
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and settle_bill_no in(
+                    select bill_no from emis_settle_sub_bill b
+                    where del_flag='0'
+                     and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
+                )
+            </if>
+
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and settle_bill_no in(