箱单导出

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -58,6 +58,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -786,7 +787,11 @@ public class CoDelServiceImpl implements CoDelService {
         String textHead = headerData.getDelNo()+"【发票："+ headerData.getCmcInvoice()+"】改单";
         String[] mailAddress = coDelMapper.queryUsersByRoleName("关务仓库",headerData.getSite()).stream().map(SysUserEntity::getEmail).toArray(String[]::new);
         String[] mailAddress2 = new String[]{coDelMapper.queryByUserName(headerData.getCreateBy()).getEmail()};
-        String[] mailAddressAll = ArrayUtils.addAll(mailAddress, mailAddress2);
+        // 合并 + 去重
+        String[] mailAddressAll = Stream.concat(Arrays.stream(mailAddress), Arrays.stream(mailAddress2))
+                .filter(Objects::nonNull) // 防止 null
+                .distinct()               // 去重
+                .toArray(String[]::new);
         if (mailAddressAll.length>0) {
             sendMailUtil(textHead, emailContent.toString(), mailAddressAll, headerData);
         }

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

@@ -201,8 +201,8 @@
 
     <update id="updateEcssDelHeader" >
       update ecss_CoDelNotifyHeader set ready_date=#{readyDate,jdbcType=TIMESTAMP} ,customer_name=#{customerName,jdbcType=NVARCHAR},
-                                        Destination=#{destination,jdbcType=NVARCHAR},shipping_mode=#{shippingMode},
-                                        remark=#{remark,jdbcType=NVARCHAR} ,cmc_invoice=#{cmcInvoice},overseasShipper=#{overseasShipper,jdbcType=NVARCHAR} ,overseasAddress=#{overseasAddress,jdbcType=NVARCHAR}
+                Destination=#{destination,jdbcType=NVARCHAR},shipping_mode=#{shippingMode},modifyFlag=#{modifyFlag},export_flag='N',
+                remark=#{remark,jdbcType=NVARCHAR} ,cmc_invoice=#{cmcInvoice},overseasShipper=#{overseasShipper,jdbcType=NVARCHAR} ,overseasAddress=#{overseasAddress,jdbcType=NVARCHAR}
       where site=#{site} and delNo=#{delNo}
     </update>