han\hanst 3 months ago
parent
commit
80cc71dedf
  1. 5
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
  2. 1
      src/main/resources/mapper/ecss/CoDelMapper.xml

5
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():"")); template.addVar("hs_code_desc", stringInput(nodifyDetailList.get(0).get("hsCodeDescEn")!=null?sbEn.toString():""));
String hsCodes = nodifyDetailList.stream() String hsCodes = nodifyDetailList.stream()
.map(m -> Objects.toString(m.get("hsCode"), "")) .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)); template.addVar("hs_code", stringInput(hsCodes));
Map<Object, Object> poNoMap = new HashMap<>(); Map<Object, Object> poNoMap = new HashMap<>();
BigDecimal ttlAmount = BigDecimal.ZERO; BigDecimal ttlAmount = BigDecimal.ZERO;

1
src/main/resources/mapper/ecss/CoDelMapper.xml

@ -420,6 +420,7 @@ create_by,create_date,update_by,update_date
and bu_no=#{buNo} and bu_no=#{buNo}
and code_no = #{codeNo} and code_no = #{codeNo}
AND part_no = #{partNo,jdbcType=VARCHAR} AND part_no = #{partNo,jdbcType=VARCHAR}
and properties_item_no = #{propertiesItemNo}
</delete> </delete>
<select id="getNewSeqNoForAlone" resultType="Double"> <select id="getNewSeqNoForAlone" resultType="Double">

Loading…
Cancel
Save