From dffe45edd085fbf7741fe1c47fa9d607703d3f86 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 10 Sep 2025 15:39:20 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84=E7=90=86=20-=20?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=8F=91=E7=A5=A8=E6=94=B6=E6=AC=BE=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=94=AF=E4=BB=98=E6=B5=81=E6=B0=B4=E5=8F=B7=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../impl/EmisSettlePayRecordServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 9375ea3f5..32c95ffbe 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 @@ -14,11 +14,13 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; @@ -444,10 +446,10 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); // 多账单合并收款 - String[] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(","); + List settleBillNoArr = Arrays.stream(emisSettlePayRecord.getSettleBillNo().split(",")).distinct().collect(Collectors.toList()); - for (int i = 0; i < settleBillNoArr.length; i++) { - String settleBillNo = settleBillNoArr[i]; + for (int i = 0; i < settleBillNoArr.size(); i++) { + String settleBillNo = settleBillNoArr.get(i); if (!StringUtils.isEmpty(settleBillNo)) { EmisSettleBill emisSettleBill = emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo); if (!"1".equals(emisSettleBill.getBlConfirmSite()) @@ -473,8 +475,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I } // 插入账单和支付单关联关系 - for (int i = 0; i < settleBillNoArr.length; i++) { - String settleBillNo = settleBillNoArr[i]; + for (int i = 0; i < settleBillNoArr.size(); i++) { + String settleBillNo = settleBillNoArr.get(i); if (!StringUtils.isEmpty(settleBillNo)) { EmisSettlePayBillRel emisSettlePayBillRel = new EmisSettlePayBillRel(); @@ -513,8 +515,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I emisSettlePayRecordMapper.insertEmisSettlePayRecord(emisSettlePayRecord); // 重新计算账单收款信息 - for (int i = 0; i < settleBillNoArr.length; i++) { - String settleBillNo = settleBillNoArr[i]; + for (int i = 0; i < settleBillNoArr.size(); i++) { + String settleBillNo = settleBillNoArr.get(i); if (!StringUtils.isEmpty(settleBillNo)) { emisSettleBillService.reCalcSettleBillPayStatus(settleBillNo); }