From 30818bf079d013ee5298c2af2b0ad8a8d82e4e4e Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Sat, 9 May 2026 10:30:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8D=95=E6=9C=AA=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8A=A5=E5=85=B3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ecss/service/impl/CoDelServiceImpl.java | 143 ++++-------------- 1 file changed, 32 insertions(+), 111 deletions(-) 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 2e7defb6..4edc6cd4 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 @@ -734,18 +734,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(inData.getSite()); declarationQuery.setDelNo(inData.getDelNo()); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -794,18 +786,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(inData.getSite()); declarationQuery.setDelNo(inData.getDelNo()); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -1343,18 +1327,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(inData.getSite()); declarationQuery.setDelNo(inData.getDelNo()); - - List deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -1363,7 +1339,7 @@ public class CoDelServiceImpl implements CoDelService { 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(); declarationQuery.setSite(inData.getSite()); declarationQuery.setDelNo(inData.getDelNo()); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -1608,18 +1576,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -1675,18 +1635,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -1792,18 +1744,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); - - deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -2125,18 +2069,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); - - List deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); @@ -2319,19 +2255,10 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); - - List deletedDeclarations = coDelMapper.searchDeclarationHeader( - new Page(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("仓库已确认"); coDelMapper.changeEcssDelStatus(notifyHeader); @@ -2882,18 +2809,12 @@ public class CoDelServiceImpl implements CoDelService { EcssDeclarationHeaderData declarationQuery = new EcssDeclarationHeaderData(); declarationQuery.setSite(headerData.getSite()); declarationQuery.setDelNo(headerData.getDelNo()); - - List declarations = coDelMapper.searchDeclarationHeader( - new Page(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()); } // 根据修改类型决定后续操作