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

改单未删除报关单

master
han\hanst 1 month ago
parent
d1c2fb0cac
commit
30818bf079
1 changed files with 32 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 143
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

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

@ -734,18 +734,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(inData.getSite()); declarationQuery.setSite(inData.getSite());
declarationQuery.setDelNo(inData.getDelNo()); declarationQuery.setDelNo(inData.getDelNo());
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", inData.getDelNo(), deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -794,18 +786,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(inData.getSite()); declarationQuery.setSite(inData.getSite());
declarationQuery.setDelNo(inData.getDelNo()); declarationQuery.setDelNo(inData.getDelNo());
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", inData.getDelNo(), deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -1343,18 +1327,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(inData.getSite()); declarationQuery.setSite(inData.getSite());
declarationQuery.setDelNo(inData.getDelNo()); declarationQuery.setDelNo(inData.getDelNo());
List<EcssDeclarationHeaderData> deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", inData.getDelNo(), deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -1363,7 +1339,7 @@ public class CoDelServiceImpl implements CoDelService {
log.info("发货通知单{}状态已更新为仓库已确认", inData.getDelNo()); log.info("发货通知单{}状态已更新为仓库已确认", inData.getDelNo());
// 发送邮件通知（包含报关单删除信息） // 发送邮件通知（包含报关单删除信息）
sendPackingChangeNotificationEmail(notifyHeader, oldBoxList, oldPalletDetailList, deletedDeclarations, inData);
sendPackingChangeNotificationEmail(notifyHeader, oldBoxList, oldPalletDetailList, Collections.singletonList(declaration), inData);
} }
} }
@ -1548,18 +1524,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(inData.getSite()); declarationQuery.setSite(inData.getSite());
declarationQuery.setDelNo(inData.getDelNo()); declarationQuery.setDelNo(inData.getDelNo());
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", inData.getDelNo(), deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -1608,18 +1576,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(site); declarationQuery.setSite(site);
declarationQuery.setDelNo(delNo); declarationQuery.setDelNo(delNo);
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", delNo, deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -1675,18 +1635,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(site); declarationQuery.setSite(site);
declarationQuery.setDelNo(delNo); declarationQuery.setDelNo(delNo);
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", delNo, deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -1792,18 +1744,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(site); declarationQuery.setSite(site);
declarationQuery.setDelNo(delNo); declarationQuery.setDelNo(delNo);
deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", delNo, deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -2125,18 +2069,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(site); declarationQuery.setSite(site);
declarationQuery.setDelNo(delNo); declarationQuery.setDelNo(delNo);
List<EcssDeclarationHeaderData> deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", delNo, deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
@ -2319,19 +2255,10 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(site); declarationQuery.setSite(site);
declarationQuery.setDelNo(delNo); declarationQuery.setDelNo(delNo);
List<EcssDeclarationHeaderData> deletedDeclarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : deletedDeclarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
log.info("已删除发货通知单{}对应的{}个报关单", delNo, deletedDeclarations.size());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
// 将通知单状态更新为仓库已确认 // 将通知单状态更新为仓库已确认
notifyHeader.setNotifyStatus("仓库已确认"); notifyHeader.setNotifyStatus("仓库已确认");
coDelMapper.changeEcssDelStatus(notifyHeader); coDelMapper.changeEcssDelStatus(notifyHeader);
@ -2882,18 +2809,12 @@ public class CoDelServiceImpl implements CoDelService {
EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData();
declarationQuery.setSite(headerData.getSite()); declarationQuery.setSite(headerData.getSite());
declarationQuery.setDelNo(headerData.getDelNo()); declarationQuery.setDelNo(headerData.getDelNo());
List<EcssDeclarationHeaderData> declarations = coDelMapper.searchDeclarationHeader(
new Page<EcssDeclarationHeaderData>(1, 1000), declarationQuery).getRecords();
EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery);
// 删除找到的报关单 // 删除找到的报关单
for (EcssDeclarationHeaderData declaration : declarations) {
log.info("删除报关单，报关单号：{}", declaration.getDeclarationNo());
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
}
coDelMapper.deleteDeclarationHeader(declaration);
coDelMapper.deleteDeclarationDetail(declaration);
log.info("已删除发货通知单{}对应的{}个报关单", headerData.getDelNo(), declarations.size());
} }
// 根据修改类型决定后续操作 // 根据修改类型决定后续操作

Write Preview
Loading…
Cancel
Save