wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

shippingMode

java8
han\hanst 3 months ago
parent
2851c8a62b
commit
7ac1edd638
5 changed files with 118 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java
  2. 229
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
  3. 3
      src/main/resources/mapper/ecss/CoDelMapper.xml
  4. BIN
      src/main/resources/templates/declaration-all-template.xlsx
  5. BIN
      src/main/resources/templates/export-goods-template.xlsx

1
src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java
View File

@ -60,4 +60,5 @@ public class EcssDeclarationHeaderData extends EcssDeclarationHeader{
private String fpremark;
private String xdremark;
private String declarationWeight;
private String destination;
}

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

@ -2479,6 +2479,7 @@ public class CoDelServiceImpl implements CoDelService {
template.addVar("localShipAddress", notifyHeader.getLocalShipAddress());
template.addVar("ccusname", stringInput(notifyHeader.getOverseasShipper()));
template.addVar("cDeliverAdd", stringInput(notifyHeader.getOverseasAddress()));
template.addVar("shippingMode", stringInput(notifyHeader.getShippingMode()));
// 发货通知单明细
List<Map> nodifyDetailList = coDelMapper.exportEcssCoDelNotifyDetail(data);
List<Map> rows = sqlSession.selectList("ecssMapper.getEcssCoDelNotifyDetailData", notifyHeader);
@ -2655,10 +2656,10 @@ public class CoDelServiceImpl implements CoDelService {
public void saveOneClickPacking(EcssCoDelPalletHeaderData inData) {
// 发货通知单
EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(inData.getSite(), inData.getDelNo());
// 检查发货通知单状态是否为已报关
boolean isCustomsCleared = "已报关".equals(notifyHeader.getNotifyStatus());
// 如果状态为已报关，保存计算前的装箱数据用于对比
List<Map> oldBoxList = new ArrayList<>();
List<EcssCoDelPalletDetailData> oldPalletDetailList = new ArrayList<>();
@ -2671,7 +2672,7 @@ public class CoDelServiceImpl implements CoDelService {
queryData.setDelNo(inData.getDelNo());
oldPalletDetailList = coDelMapper.searchEcssCoDelPalletDetailData(queryData);
}
// 先删除已存在的装箱数据
clearPalletData(notifyHeader);
SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
@ -2868,7 +2869,7 @@ public class CoDelServiceImpl implements CoDelService {
//notifyHeader.setModifyFlag(false);
coDelMapper.updateEcssDelHeaderForModify(notifyHeader);
coDelMapper.updateEcssDelDetailForModify(notifyHeader);
// 如果状态为已报关，发送邮件通知创建人
if (isCustomsCleared) {
sendPackingChangeNotificationEmail(notifyHeader, oldBoxList, oldPalletDetailList, inData);
@ -3127,19 +3128,19 @@ public class CoDelServiceImpl implements CoDelService {
String site = boxData.get("site").toString();
String delNo = boxData.get("delNo").toString();
EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(site, delNo);
// 检查发货通知单状态是否为已报关
boolean isCustomsCleared = "已报关".equals(notifyHeader.getNotifyStatus());
// 如果状态为已报关，保存修改前的装箱数据用于对比
List<Map> oldBoxList = new ArrayList<>();
if (isCustomsCleared) {
oldBoxList = coDelMapper.selectBoxList(notifyHeader);
}
// 执行修改操作
coDelMapper.updateBoxInfo(boxData);
// 如果状态为已报关，发送邮件通知创建人
if (isCustomsCleared) {
sendBoxChangeNotificationEmail(notifyHeader, oldBoxList, "修改", boxData);
@ -3153,16 +3154,16 @@ public class CoDelServiceImpl implements CoDelService {
String site = boxData.get("site").toString();
String delNo = boxData.get("delNo").toString();
EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(site, delNo);
// 检查发货通知单状态是否为已报关
boolean isCustomsCleared = "已报关".equals(notifyHeader.getNotifyStatus());
// 如果状态为已报关，保存删除前的装箱数据用于对比
List<Map> oldBoxList = new ArrayList<>();
if (isCustomsCleared) {
oldBoxList = coDelMapper.selectBoxList(notifyHeader);
}
// 获取该箱下的全部箱明细
EcssCoDelPalletHeaderData inData = new EcssCoDelPalletHeaderData();
inData.setSite(boxData.get("site").toString());
@ -3197,7 +3198,7 @@ public class CoDelServiceImpl implements CoDelService {
boxData.get("buNo").toString(), boxData.get("delNo").toString(),
Integer.parseInt(boxData.get("item_no").toString()), null);
coDelMapper.deleteBoxInfo(boxData);
// 如果状态为已报关，发送邮件通知创建人
if (isCustomsCleared) {
sendBoxChangeNotificationEmail(notifyHeader, oldBoxList, "删除", boxData);
@ -3209,10 +3210,10 @@ public class CoDelServiceImpl implements CoDelService {
public void updateDetailInfo(EcssCoDelPalletData detailData) {
// 获取发货通知单信息
EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(detailData.getSite(), detailData.getDelNo());
// 检查发货通知单状态是否为已报关
boolean isCustomsCleared = "已报关".equals(notifyHeader.getNotifyStatus());
// 如果状态为已报关，保存修改前的装箱数据用于对比
List<EcssCoDelPalletDetailData> oldPalletDetailList = new ArrayList<>();
if (isCustomsCleared) {
@ -3222,7 +3223,7 @@ public class CoDelServiceImpl implements CoDelService {
queryData.setDelNo(detailData.getDelNo());
oldPalletDetailList = coDelMapper.searchEcssCoDelPalletDetailData(queryData);
}
Integer notifyDetailItemNo = detailData.getNotifyDetailItemNo();
BigDecimal qty = detailData.getQty();
BigDecimal oldQty = detailData.getOldQty();
@ -3247,7 +3248,7 @@ public class CoDelServiceImpl implements CoDelService {
coDelMapper.updateEcssCoDelNotifyDetailSurplus(notifyDetail);
}
}
// 如果状态为已报关，发送邮件通知创建人
if (isCustomsCleared) {
sendDetailChangeNotificationEmail(notifyHeader, oldPalletDetailList, "修改", detailData);
@ -3259,10 +3260,10 @@ public class CoDelServiceImpl implements CoDelService {
public void deleteDetailInfo(EcssCoDelPalletData detailData) {
// 获取发货通知单信息
EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(detailData.getSite(), detailData.getDelNo());
// 检查发货通知单状态是否为已报关
boolean isCustomsCleared = "已报关".equals(notifyHeader.getNotifyStatus());
// 如果状态为已报关，保存删除前的装箱数据用于对比
List<EcssCoDelPalletDetailData> oldPalletDetailList = new ArrayList<>();
if (isCustomsCleared) {
@ -3272,7 +3273,7 @@ public class CoDelServiceImpl implements CoDelService {
queryData.setDelNo(detailData.getDelNo());
oldPalletDetailList = coDelMapper.searchEcssCoDelPalletDetailData(queryData);
}
// 删除明细前，先获取被删除明细的数量和notifyDetailItemNo
Integer notifyDetailItemNo = detailData.getNotifyDetailItemNo();
BigDecimal deletedQty = detailData.getQty();
@ -3303,7 +3304,7 @@ public class CoDelServiceImpl implements CoDelService {
coDelMapper.updateEcssCoDelNotifyDetailSurplus(notifyDetail);
}
}
// 如果状态为已报关，发送邮件通知创建人
if (isCustomsCleared) {
sendDetailChangeNotificationEmail(notifyHeader, oldPalletDetailList, "删除", detailData);
@ -3442,7 +3443,7 @@ public class CoDelServiceImpl implements CoDelService {
/**
* 发送装箱变更通知邮件
*
*
* @param notifyHeader 发货通知单头数据
* @param oldBoxList 计算前的箱子列表
* @param oldPalletDetailList 计算前的装箱明细列表
@ -3450,13 +3451,13 @@ public class CoDelServiceImpl implements CoDelService {
* @author AI Assistant
* @date 2024-10-09
*/
private void sendPackingChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<Map> oldBoxList,
private void sendPackingChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<Map> oldBoxList,
List<EcssCoDelPalletDetailData> oldPalletDetailList,
EcssCoDelPalletHeaderData inData) {
try {
log.info("开始发送装箱变更通知邮件，发货通知单号：{}", notifyHeader.getDelNo());
// 获取计算后的装箱数据
List<Map> newBoxList = coDelMapper.selectBoxList(notifyHeader);
EcssCoDelPalletHeaderData queryData = new EcssCoDelPalletHeaderData();
@ -3464,37 +3465,37 @@ public class CoDelServiceImpl implements CoDelService {
queryData.setBuNo(inData.getBuNo());
queryData.setDelNo(inData.getDelNo());
List<EcssCoDelPalletDetailData> newPalletDetailList = coDelMapper.searchEcssCoDelPalletDetailData(queryData);
// 生成对比邮件内容
String emailContent = generatePackingComparisonEmailContent(notifyHeader, oldBoxList, newBoxList,
String emailContent = generatePackingComparisonEmailContent(notifyHeader, oldBoxList, newBoxList,
oldPalletDetailList, newPalletDetailList);
// 获取发货通知单创建人邮箱
String creatorEmail = coDelMapper.queryByUserName(notifyHeader.getCreateBy()).getEmail();
if (StringUtils.isBlank(creatorEmail)) {
log.warn("发货通知单创建人{}没有配置邮箱地址", notifyHeader.getCreateBy());
return;
}
// 发送邮件
String subject = String.format("发货通知单%s【发票：%s】一键装箱数据变更通知",
String subject = String.format("发货通知单%s【发票：%s】一键装箱数据变更通知",
notifyHeader.getDelNo(), notifyHeader.getCmcInvoice());
String[] mailAddress = {creatorEmail};
sendMailUtil(subject, emailContent, mailAddress, notifyHeader);
log.info("装箱变更通知邮件发送成功，收件人：{}", creatorEmail);
} catch (Exception e) {
log.error("发送装箱变更通知邮件失败，发货通知单号：{}, 错误信息：{}",
log.error("发送装箱变更通知邮件失败，发货通知单号：{}, 错误信息：{}",
notifyHeader.getDelNo(), e.getMessage(), e);
// 邮件发送失败不影响主流程，只记录日志
}
}
/**
* 生成装箱对比邮件内容
*
*
* @param notifyHeader 发货通知单头数据
* @param oldBoxList 计算前的箱子列表
* @param newBoxList 计算后的箱子列表
@ -3510,7 +3511,7 @@ public class CoDelServiceImpl implements CoDelService {
List<EcssCoDelPalletDetailData> oldPalletDetailList,
List<EcssCoDelPalletDetailData> newPalletDetailList) {
StringBuilder emailContent = new StringBuilder();
emailContent.append("<!DOCTYPE html>");
emailContent.append("<html>");
emailContent.append("<head>");
@ -3525,7 +3526,7 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("</style>");
emailContent.append("</head>");
emailContent.append("<body>");
// 邮件标题
emailContent.append("<h2>发货通知单一键装箱数据变更通知</h2>");
emailContent.append("<p><strong>发货通知单号：</strong>").append(notifyHeader.getDelNo()).append("</p>");
@ -3533,31 +3534,31 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("<p><strong>客户：</strong>").append(notifyHeader.getCustomerName()).append("</p>");
emailContent.append("<p><strong>操作时间：</strong>").append(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")).append("</p>");
emailContent.append("<p><strong>操作类型：</strong><span class='changed'>一键装箱重新计算</span></p>");
// 箱子信息对比
emailContent.append("<div class='section-title'>箱子信息对比</div>");
emailContent.append(generateBoxListComparisonTable(oldBoxList, newBoxList));
// 装箱明细对比
emailContent.append("<div class='section-title'>装箱明细对比</div>");
emailContent.append(generatePalletDetailComparisonTable(oldPalletDetailList, newPalletDetailList));
emailContent.append("</body>");
emailContent.append("</html>");
return emailContent.toString();
}
/**
* 生成箱子列表对比表格
*
*
* @param oldBoxList 计算前的箱子列表
* @param newBoxList 计算后的箱子列表
* @return HTML表格内容
*/
private String generateBoxListComparisonTable(List<Map> oldBoxList, List<Map> newBoxList) {
StringBuilder table = new StringBuilder();
table.append("<table>");
table.append("<tr>");
table.append("<th>序号</th>");
@ -3568,35 +3569,35 @@ public class CoDelServiceImpl implements CoDelService {
table.append("<th>箱数(计算前)</th>");
table.append("<th>箱数(计算后)</th>");
table.append("</tr>");
// 创建映射以便对比
Map<Integer, Map> oldBoxMap = new HashMap<>();
for (Map box : oldBoxList) {
Integer itemNo = (Integer) box.get("item_no");
oldBoxMap.put(itemNo, box);
}
Map<Integer, Map> newBoxMap = new HashMap<>();
for (Map box : newBoxList) {
Integer itemNo = (Integer) box.get("item_no");
newBoxMap.put(itemNo, box);
}
// 获取所有序号
Set<Integer> allItemNos = new HashSet<>();
allItemNos.addAll(oldBoxMap.keySet());
allItemNos.addAll(newBoxMap.keySet());
List<Integer> sortedItemNos = new ArrayList<>(allItemNos);
sortedItemNos.sort(Integer::compareTo);
for (Integer itemNo : sortedItemNos) {
Map oldBox = oldBoxMap.get(itemNo);
Map newBox = newBoxMap.get(itemNo);
table.append("<tr>");
table.append("<td>").append(itemNo).append("</td>");
// 毛重对比
BigDecimal oldGrossWeight = oldBox != null ? (BigDecimal) oldBox.get("gross_weight") : BigDecimal.ZERO;
BigDecimal newGrossWeight = newBox != null ? (BigDecimal) newBox.get("gross_weight") : BigDecimal.ZERO;
@ -3606,7 +3607,7 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newGrossWeight)).append("</td>");
}
// 净重对比
BigDecimal oldNetWeight = oldBox != null ? (BigDecimal) oldBox.get("net_weight") : BigDecimal.ZERO;
BigDecimal newNetWeight = newBox != null ? (BigDecimal) newBox.get("net_weight") : BigDecimal.ZERO;
@ -3616,7 +3617,7 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newNetWeight)).append("</td>");
}
// 箱数对比
BigDecimal oldBoxQty = oldBox != null ? (BigDecimal) oldBox.get("box_qty") : BigDecimal.ZERO;
BigDecimal newBoxQty = newBox != null ? (BigDecimal) newBox.get("box_qty") : BigDecimal.ZERO;
@ -3626,25 +3627,25 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newBoxQty)).append("</td>");
}
table.append("</tr>");
}
table.append("</table>");
return table.toString();
}
/**
* 生成装箱明细对比表格
*
*
* @param oldPalletDetailList 计算前的装箱明细列表
* @param newPalletDetailList 计算后的装箱明细列表
* @return HTML表格内容
*/
private String generatePalletDetailComparisonTable(List<EcssCoDelPalletDetailData> oldPalletDetailList,
private String generatePalletDetailComparisonTable(List<EcssCoDelPalletDetailData> oldPalletDetailList,
List<EcssCoDelPalletDetailData> newPalletDetailList) {
StringBuilder table = new StringBuilder();
table.append("<table>");
table.append("<tr>");
table.append("<th>序号</th>");
@ -3658,25 +3659,25 @@ public class CoDelServiceImpl implements CoDelService {
table.append("<th>卷数(计算前)</th>");
table.append("<th>卷数(计算后)</th>");
table.append("</tr>");
// 创建映射以便对比 - 使用序号+项次作为唯一标识
Map<String, EcssCoDelPalletDetailData> oldDetailMap = new HashMap<>();
for (EcssCoDelPalletDetailData detail : oldPalletDetailList) {
String key = detail.getSeqNo() + "_" + detail.getItemNo();
oldDetailMap.put(key, detail);
}
Map<String, EcssCoDelPalletDetailData> newDetailMap = new HashMap<>();
for (EcssCoDelPalletDetailData detail : newPalletDetailList) {
String key = detail.getSeqNo() + "_" + detail.getItemNo();
newDetailMap.put(key, detail);
}
// 获取所有键值
Set<String> allKeys = new HashSet<>();
allKeys.addAll(oldDetailMap.keySet());
allKeys.addAll(newDetailMap.keySet());
List<String> sortedKeys = new ArrayList<>(allKeys);
sortedKeys.sort((a, b) -> {
String[] aParts = a.split("_");
@ -3685,24 +3686,24 @@ public class CoDelServiceImpl implements CoDelService {
if (seqCompare != 0) return seqCompare;
return Integer.compare(Integer.parseInt(aParts[1]), Integer.parseInt(bParts[1]));
});
for (String key : sortedKeys) {
EcssCoDelPalletDetailData oldDetail = oldDetailMap.get(key);
EcssCoDelPalletDetailData newDetail = newDetailMap.get(key);
String[] keyParts = key.split("_");
Integer seqNo = Integer.parseInt(keyParts[0]);
Integer itemNo = Integer.parseInt(keyParts[1]);
table.append("<tr>");
table.append("<td>").append(seqNo).append("</td>");
table.append("<td>").append(itemNo).append("</td>");
// 物料号和PN（取新数据或旧数据）
EcssCoDelPalletDetailData referenceDetail = newDetail != null ? newDetail : oldDetail;
table.append("<td>").append(referenceDetail.getPartNo() != null ? referenceDetail.getPartNo() : "").append("</td>");
table.append("<td>").append(referenceDetail.getPn() != null ? referenceDetail.getPn() : "").append("</td>");
// 数量对比
BigDecimal oldQty = oldDetail != null ? oldDetail.getQty() : BigDecimal.ZERO;
BigDecimal newQty = newDetail != null ? newDetail.getQty() : BigDecimal.ZERO;
@ -3712,7 +3713,7 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newQty)).append("</td>");
}
// 箱数对比
BigDecimal oldBoxQty = oldDetail != null ? oldDetail.getBoxQty() : BigDecimal.ZERO;
BigDecimal newBoxQty = newDetail != null ? newDetail.getBoxQty() : BigDecimal.ZERO;
@ -3722,7 +3723,7 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newBoxQty)).append("</td>");
}
// 卷数对比
BigDecimal oldRolls = oldDetail != null ? oldDetail.getRolls() : BigDecimal.ZERO;
BigDecimal newRolls = newDetail != null ? newDetail.getRolls() : BigDecimal.ZERO;
@ -3732,17 +3733,17 @@ public class CoDelServiceImpl implements CoDelService {
} else {
table.append("<td>").append(formatDecimal(newRolls)).append("</td>");
}
table.append("</tr>");
}
table.append("</table>");
return table.toString();
}
/**
* 格式化BigDecimal数值显示
*
*
* @param value 数值
* @return 格式化后的字符串
*/
@ -3752,10 +3753,10 @@ public class CoDelServiceImpl implements CoDelService {
}
return value.stripTrailingZeros().toPlainString();
}
/**
* 发送箱子变更通知邮件
*
*
* @param notifyHeader 发货通知单头数据
* @param oldBoxList 操作前的箱子列表
* @param operation 操作类型（修改/删除）
@ -3763,45 +3764,45 @@ public class CoDelServiceImpl implements CoDelService {
* @author AI Assistant
* @date 2024-10-09
*/
private void sendBoxChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<Map> oldBoxList,
private void sendBoxChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<Map> oldBoxList,
String operation,
Map<String, Object> boxData) {
try {
log.info("开始发送箱子{}通知邮件，发货通知单号：{}", operation, notifyHeader.getDelNo());
// 获取操作后的装箱数据
List<Map> newBoxList = coDelMapper.selectBoxList(notifyHeader);
// 生成对比邮件内容
String emailContent = generateBoxChangeEmailContent(notifyHeader, oldBoxList, newBoxList, operation, boxData);
// 获取发货通知单创建人邮箱
String creatorEmail = coDelMapper.queryByUserName(notifyHeader.getCreateBy()).getEmail();
if (StringUtils.isBlank(creatorEmail)) {
log.warn("发货通知单创建人{}没有配置邮箱地址", notifyHeader.getCreateBy());
return;
}
// 发送邮件
String subject = String.format("发货通知单%s【发票：%s】箱子%s通知",
String subject = String.format("发货通知单%s【发票：%s】箱子%s通知",
notifyHeader.getDelNo(), notifyHeader.getCmcInvoice(), operation);
String[] mailAddress = {creatorEmail};
sendMailUtil(subject, emailContent, mailAddress, notifyHeader);
log.info("箱子{}通知邮件发送成功，收件人：{}", operation, creatorEmail);
} catch (Exception e) {
log.error("发送箱子{}通知邮件失败，发货通知单号：{}, 错误信息：{}",
log.error("发送箱子{}通知邮件失败，发货通知单号：{}, 错误信息：{}",
operation, notifyHeader.getDelNo(), e.getMessage(), e);
// 邮件发送失败不影响主流程，只记录日志
}
}
/**
* 发送箱明细变更通知邮件
*
*
* @param notifyHeader 发货通知单头数据
* @param oldPalletDetailList 操作前的装箱明细列表
* @param operation 操作类型（修改/删除）
@ -3809,49 +3810,49 @@ public class CoDelServiceImpl implements CoDelService {
* @author AI Assistant
* @date 2024-10-09
*/
private void sendDetailChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<EcssCoDelPalletDetailData> oldPalletDetailList,
private void sendDetailChangeNotificationEmail(EcssCoDelNotifyHeaderData notifyHeader,
List<EcssCoDelPalletDetailData> oldPalletDetailList,
String operation,
EcssCoDelPalletData detailData) {
try {
log.info("开始发送箱明细{}通知邮件，发货通知单号：{}", operation, notifyHeader.getDelNo());
// 获取操作后的装箱数据
EcssCoDelPalletHeaderData queryData = new EcssCoDelPalletHeaderData();
queryData.setSite(detailData.getSite());
queryData.setBuNo(detailData.getBuNo());
queryData.setDelNo(detailData.getDelNo());
List<EcssCoDelPalletDetailData> newPalletDetailList = coDelMapper.searchEcssCoDelPalletDetailData(queryData);
// 生成对比邮件内容
String emailContent = generateDetailChangeEmailContent(notifyHeader, oldPalletDetailList, newPalletDetailList, operation, detailData);
// 获取发货通知单创建人邮箱
String creatorEmail = coDelMapper.queryByUserName(notifyHeader.getCreateBy()).getEmail();
if (StringUtils.isBlank(creatorEmail)) {
log.warn("发货通知单创建人{}没有配置邮箱地址", notifyHeader.getCreateBy());
return;
}
// 发送邮件
String subject = String.format("发货通知单%s【发票：%s】箱明细%s通知",
String subject = String.format("发货通知单%s【发票：%s】箱明细%s通知",
notifyHeader.getDelNo(), notifyHeader.getCmcInvoice(), operation);
String[] mailAddress = {creatorEmail};
sendMailUtil(subject, emailContent, mailAddress, notifyHeader);
log.info("箱明细{}通知邮件发送成功，收件人：{}", operation, creatorEmail);
} catch (Exception e) {
log.error("发送箱明细{}通知邮件失败，发货通知单号：{}, 错误信息：{}",
log.error("发送箱明细{}通知邮件失败，发货通知单号：{}, 错误信息：{}",
operation, notifyHeader.getDelNo(), e.getMessage(), e);
// 邮件发送失败不影响主流程，只记录日志
}
}
/**
* 生成箱子变更邮件内容
*
*
* @param notifyHeader 发货通知单头数据
* @param oldBoxList 操作前的箱子列表
* @param newBoxList 操作后的箱子列表
@ -3865,7 +3866,7 @@ public class CoDelServiceImpl implements CoDelService {
String operation,
Map<String, Object> boxData) {
StringBuilder emailContent = new StringBuilder();
emailContent.append("<!DOCTYPE html>");
emailContent.append("<html>");
emailContent.append("<head>");
@ -3881,7 +3882,7 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("</style>");
emailContent.append("</head>");
emailContent.append("<body>");
// 邮件标题
emailContent.append("<h2>发货通知单箱子").append(operation).append("通知</h2>");
emailContent.append("<p><strong>发货通知单号：</strong>").append(notifyHeader.getDelNo()).append("</p>");
@ -3889,20 +3890,20 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("<p><strong>客户：</strong>").append(notifyHeader.getCustomerName()).append("</p>");
emailContent.append("<p><strong>操作时间：</strong>").append(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")).append("</p>");
emailContent.append("<p><strong>操作类型：</strong><span class='changed'>").append(operation).append("箱子（序号：").append(boxData.get("item_no")).append("）</span></p>");
// 箱子信息对比
emailContent.append("<div class='section-title'>箱子信息对比</div>");
emailContent.append(generateBoxListComparisonTable(oldBoxList, newBoxList));
emailContent.append("</body>");
emailContent.append("</html>");
return emailContent.toString();
}
/**
* 生成箱明细变更邮件内容
*
*
* @param notifyHeader 发货通知单头数据
* @param oldPalletDetailList 操作前的装箱明细列表
* @param newPalletDetailList 操作后的装箱明细列表
@ -3916,7 +3917,7 @@ public class CoDelServiceImpl implements CoDelService {
String operation,
EcssCoDelPalletData detailData) {
StringBuilder emailContent = new StringBuilder();
emailContent.append("<!DOCTYPE html>");
emailContent.append("<html>");
emailContent.append("<head>");
@ -3932,7 +3933,7 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("</style>");
emailContent.append("</head>");
emailContent.append("<body>");
// 邮件标题
emailContent.append("<h2>发货通知单箱明细").append(operation).append("通知</h2>");
emailContent.append("<p><strong>发货通知单号：</strong>").append(notifyHeader.getDelNo()).append("</p>");
@ -3940,14 +3941,14 @@ public class CoDelServiceImpl implements CoDelService {
emailContent.append("<p><strong>客户：</strong>").append(notifyHeader.getCustomerName()).append("</p>");
emailContent.append("<p><strong>操作时间：</strong>").append(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")).append("</p>");
emailContent.append("<p><strong>操作类型：</strong><span class='changed'>").append(operation).append("箱明细（序号：").append(detailData.getSeqNo()).append("，项次：").append(detailData.getItemNo()).append("）</span></p>");
// 装箱明细对比
emailContent.append("<div class='section-title'>装箱明细对比</div>");
emailContent.append(generatePalletDetailComparisonTable(oldPalletDetailList, newPalletDetailList));
emailContent.append("</body>");
emailContent.append("</html>");
return emailContent.toString();
}

3
src/main/resources/mapper/ecss/CoDelMapper.xml
View File

@ -591,7 +591,8 @@ create_by,create_date,update_by,update_date
a.premium,a.other_price,a.special_relationship_comfirm,a.price_influence_confirm,a.royalty_payments_confirm,
a.create_by,a.create_date,a.update_by,a.update_date,a.delNo,noHeader.bu_no,
a.upc,a.so,a.origin,a.pallet_weight,a.material,a.hs_code,a.packaging,a.kgs,a.shipping_mark,
a.hsCodeDesc,a.contractFlag,a.hsCodeDescType,a.goodsLabel,a.boxChange,noHeader.customer_name as customName
a.hsCodeDesc,a.contractFlag,a.hsCodeDescType,a.goodsLabel,a.boxChange,noHeader.customer_name as customName,
noHeader.destination
from ecss_declaration_header a
left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=noHeader.delNo

BIN
src/main/resources/templates/declaration-all-template.xlsx
View File

BIN
src/main/resources/templates/export-goods-template.xlsx
View File

Write Preview
Loading…
Cancel
Save