From b2c412e4d8add78644b8c4c5a7ee6ccc5cdb0d06 Mon Sep 17 00:00:00 2001
From: zzs <hi@vio.vin>
Date: Fri, 21 Feb 2025 17:32:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=96=E6=B6=88=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BF=85=E5=BD=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShippingDetailSubmitValidator.java        | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java
index f42a496f..998f85ca 100644
--- a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java
+++ b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java
@@ -70,7 +70,7 @@ public class ShippingDetailSubmitValidator extends AbstractValidator {
                 }
             }
             vehicleNoSingle(dataEntitie);
-            validateTaxRefundRate(dataEntitie);
+//            validateTaxRefundRate(dataEntitie);
         }
     }
 
@@ -79,28 +79,32 @@ public class ShippingDetailSubmitValidator extends AbstractValidator {
      *
      * @param dataEntitie
      */
-    private void validateTaxRefundRate(ExtendedDataEntity dataEntitie) {
-        DynamicObject dataEntity = dataEntitie.getDataEntity();
-        String isdeclare = dataEntity.getString("yem_isdeclare");
-        if (!"A".equals(isdeclare)) return;
-        DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
-        StringBuilder sb = new StringBuilder();
-        for (DynamicObject dynamicObject : collection) {
-            int index = collection.indexOf(dynamicObject);
-            boolean ifgift = dynamicObject.getBoolean("yem_ifgift");
-            if (!ifgift) {
-//                BigDecimal degrate = dynamicObject.getBigDecimal("yem_degrate");
-                DynamicObject hscode = dynamicObject.getDynamicObject("yem_hscode");
-                if (YEM.isEmpty(hscode)) {
-                    sb.append(String.format("商品明细第 [ %s ] 行，海关编码为空，请填写后提交！", index + 1)).append("\r\n");
-                }
-            }
-        }
 
-        if (sb.length() > 0) {
-            this.addErrorMessage(dataEntitie, sb.toString());
-        }
-    }
+    /**
+     * 取消，改为手动配置
+     */
+//    private void validateTaxRefundRate(ExtendedDataEntity dataEntitie) {
+//        DynamicObject dataEntity = dataEntitie.getDataEntity();
+//        String isdeclare = dataEntity.getString("yem_isdeclare");
+//        if (!"A".equals(isdeclare)) return;
+//        DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
+//        StringBuilder sb = new StringBuilder();
+//        for (DynamicObject dynamicObject : collection) {
+//            int index = collection.indexOf(dynamicObject);
+//            boolean ifgift = dynamicObject.getBoolean("yem_ifgift");
+//            if (!ifgift) {
+//                DynamicObject hscode = dynamicObject.getDynamicObject("yem_hscode");
+//                if (YEM.isEmpty(hscode)) {
+//                    sb.append(String.format("商品明细第 [ %s ] 行，海关编码为空，请填写后提交！", index + 1)).append("\r\n");
+//                }
+//
+//            }
+//        }
+//
+//        if (sb.length() > 0) {
+//            this.addErrorMessage(dataEntitie, sb.toString());
+//        }
+//    }
 
     /**
      * @description 整机生产信息中整机编号唯一性校验