From 80cc71dedfe5fee7c3aedeab90b427ddee1f7317 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Thu, 9 Oct 2025 21:01:25 +0800 Subject: [PATCH] bug --- .../sys/modules/ecss/service/impl/CoDelServiceImpl.java | 5 ++++- src/main/resources/mapper/ecss/CoDelMapper.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 60d761aa..45145bcc 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -2496,7 +2496,10 @@ public class CoDelServiceImpl implements CoDelService { template.addVar("hs_code_desc", stringInput(nodifyDetailList.get(0).get("hsCodeDescEn")!=null?sbEn.toString():"")); String hsCodes = nodifyDetailList.stream() .map(m -> Objects.toString(m.get("hsCode"), "")) - .collect(Collectors.joining("\n")); + .filter(s -> !s.isEmpty()) // 去掉空值 + .distinct() // 去重 + .collect(Collectors.joining("、")); // 用换行拼接 + template.addVar("hs_code", stringInput(hsCodes)); Map poNoMap = new HashMap<>(); BigDecimal ttlAmount = BigDecimal.ZERO; diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 6f9ab4de..28147af0 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -420,6 +420,7 @@ create_by,create_date,update_by,update_date and bu_no=#{buNo} and code_no = #{codeNo} AND part_no = #{partNo,jdbcType=VARCHAR} + and properties_item_no = #{propertiesItemNo}