WET产品非整卷

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;
 }

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

@@ -1623,7 +1623,7 @@ public class CoDelServiceImpl implements CoDelService {
 
         // 保存删除前的装箱数据（用于邮件通知）
         List<Map> oldBoxList = new ArrayList<>();
-        List<EcssDeclarationHeaderData> deletedDeclarations = null;
+        List<EcssDeclarationHeaderData> 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);

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