From ca069154f649d398be46c844d9e4bdc28abc2cce Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Mon, 7 Apr 2025 11:42:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E5=87=BA=E5=8F=A3=E6=8A=A5?=
 =?UTF-8?q?=E5=85=B3=E6=8F=90=E4=BA=A4=E6=97=B6=E9=87=91=E9=A2=9D=E5=B7=AE?=
 =?UTF-8?q?=E5=80=BC=E6=B1=87=E6=80=BB=E4=B8=BA0=E5=88=99=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validator/DeclareDocxSubmitValidator.java         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/declaredocx/validator/DeclareDocxSubmitValidator.java b/src/main/java/com/yem/wm/es/declaredocx/validator/DeclareDocxSubmitValidator.java
index 69c3c04a..c88a5c82 100644
--- a/src/main/java/com/yem/wm/es/declaredocx/validator/DeclareDocxSubmitValidator.java
+++ b/src/main/java/com/yem/wm/es/declaredocx/validator/DeclareDocxSubmitValidator.java
@@ -34,14 +34,15 @@ public class DeclareDocxSubmitValidator extends AbstractValidator {
                 map.put(index, exportmat);
             }
             StringBuilder sb = new StringBuilder();
+            BigDecimal amt = BigDecimal.ZERO;
             for (Map.Entry<Integer, BigDecimal> entry : map.entrySet()) {
                 Integer idx = entry.getKey();
-                BigDecimal amt = entry.getValue();
-                if (amt.compareTo(BigDecimal.ZERO) != 0) {
-                    sb.append(String.format("商品明细第 [ %s ] 行，出库金额跟报关金额差值 [ %s ]不允许提交，请修改后重试。", idx + 1, amt.setScale(2, RoundingMode.HALF_UP)));
-                }
-            }
+                amt = entry.getValue();
 
+            }
+            if (amt.compareTo(BigDecimal.ZERO) != 0) {
+                sb.append(String.format("商品明细，出库金额跟报关金额差值 [ %s ]不允许提交，请修改后重试。", amt.setScale(2, RoundingMode.HALF_UP)));
+            }
             if (sb.length() > 0) {
                 this.addErrorMessage(extendedDataEntity, sb.toString());
             }