From 51164a0fb9ca8e535e79da2a7448022ae616a8f2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 5 May 2025 15:07:57 +0800
Subject: [PATCH] md

---
 .../impl/EmisSettlePayRecordServiceImpl.java     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 a96969a24..ef648125b 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
@@ -127,15 +127,20 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
             }
         }
 
-        EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(emisSettlePayRecord.getSettleBillNo());
-        if(!"1".equals(emisSettleBill.getBlConfirmSite()) ){
-            throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认，不允许收款！");
-        }
-
         emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()));
         // 多账单合并收款
         String [] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(",");
 
+        for(int i=0;i<settleBillNoArr.length;i++) {
+            String settleBillNo = settleBillNoArr[i];
+            if(!StringUtils.isEmpty(settleBillNo)) {
+                EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
+                if(!"1".equals(emisSettleBill.getBlConfirmSite()) ){
+                    throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认，不允许收款！");
+                }
+            }
+        }
+
         // 不重复的 id流水号
         String  payId= WaybillHelper.genPayId();
         emisSettlePayRecord.setPayId(payId);
@@ -152,6 +157,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         for(int i=0;i<settleBillNoArr.length;i++) {
             String settleBillNo = settleBillNoArr[i];
             if(!StringUtils.isEmpty(settleBillNo)) {
+
                 EmisSettlePayBillRel emisSettlePayBillRel = new EmisSettlePayBillRel();
                 emisSettlePayBillRel.setPayId(payId);
                 emisSettlePayBillRel.setSettleBillNo(settleBillNo);