From 9046bbed61b47cd5d630c16760beb12be172a5de Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 12 May 2026 14:38:11 +0800 Subject: [PATCH] =?UTF-8?q?WET=E4=BA=A7=E5=93=81=E9=9D=9E=E6=95=B4?= =?UTF-8?q?=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java | 1 + .../xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java | 3 ++- src/main/resources/mapper/ecss/CoDelMapper.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java index bd385a55..99cd36b3 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java +++ b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java @@ -27,6 +27,7 @@ public class EcssCoDelNotifyDetailData extends EcssCoDelNotifyDetail { private BigDecimal useQty; private BigDecimal surplusQty; private String packageNo; + private String cinvcname; private String qtyRoll; private String qtyBox; } 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 4edc6cd4..ba84d0ca 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 @@ -1623,7 +1623,7 @@ public class CoDelServiceImpl implements CoDelService { // 保存删除前的装箱数据（用于邮件通知） List oldBoxList = new ArrayList<>(); - List deletedDeclarations = null; + List deletedDeclarations = new ArrayList<>(); if (isCustomsCleared) { log.info("批量删除箱：发货通知单{}状态为已报关，开始删除对应的报关单", delNo); @@ -1636,6 +1636,7 @@ public class CoDelServiceImpl implements CoDelService { declarationQuery.setSite(site); declarationQuery.setDelNo(delNo); EcssDeclarationHeaderData declaration = coDelMapper.getDeclarationHeaderByDelNo(declarationQuery); + deletedDeclarations.add(declaration); // 删除找到的报关单 coDelMapper.deleteDeclarationHeader(declaration); coDelMapper.deleteDeclarationDetail(declaration); diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index f8da64c4..78644451 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -149,7 +149,7 @@ a.part_no,a.part_description,a.qty,a.lt,a.cmc_comment,a.saleType,a.awb_bl,a.shipping_number,a.forwarder_info,isnull(a.surplus_qty,0) surplusQty, a.currency,a.tp,a.ttl_amount,a.sum_price,a.so,a.upc,a.remark,a.erp_delItemNo,a.pn,CONVERT(DECIMAL(20, 0),a.nocartons) as nocartons, c.num_value as boxrolls,d.num_value as rollqty,w.num_value as boxweight,#{cmcInvoice} as cmcInvoice,a.modifyFlag,a.modifyQtyFlag, - b.hsCodeDesc,a.vat,a.roll,a.carton,b.packageNo,a.qty_roll as qtyRoll,a.qty_box as qtyBox + b.hsCodeDesc,a.vat,a.roll,a.carton,b.packageNo,b.cinvcname,a.qty_roll as qtyRoll,a.qty_box as qtyBox from ecss_CoDelNotifydetail a left join part b on a.site=b.site and a.part_no=b.part_no left join part_sub_properties_value c on a.part_no=c.part_no and c.site=a.site and c.bu_no=a.bu_no