diff --git a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java index 967c2c48..43f9eeea 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java +++ b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java @@ -221,6 +221,8 @@ public interface CoDelMapper { List getNotifyDetailGroup(EcssDeclarationHeaderData data); + List getNotifyDetailGroupTX(EcssDeclarationHeaderData data); + List getPropertiesListByTypeAndCodeNo(@Param("site") String site,@Param("recordType") String recordType, @Param("codeNo") String codeNo,@Param("buNo") String buNo,@Param("pn") String pn); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index 0daf01a8..7d328666 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1953,7 +1953,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo()); template.addVar("cmcInvoice", notifyHeader.getCmcInvoice()); template.addVar("readyDate", DateUtils.format(notifyHeader.getReadyDate(), "yyyy/MM/dd")); - List notifyDetailGroup = coDelMapper.getNotifyDetailGroup(data); + List notifyDetailGroup = coDelMapper.getNotifyDetailGroupTX(data); BigDecimal totalQty = BigDecimal.ZERO; BigDecimal totalAmount = BigDecimal.ZERO; for (int i = 0; i < notifyDetailGroup.size(); i++) { diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 3c9809a1..959151b2 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -685,9 +685,9 @@ create_by,create_date,update_by,update_date - insert into ecss_declaration_detail(site,declaration_no,item_no,hs_code,hs_code_desc,qty,net_weight,unit_price,total_price,currency,made_area,destination, + insert into ecss_declaration_detail(site,declaration_no,item_no,hs_code,hs_code_desc,brand,qty,net_weight,unit_price,total_price,currency,made_area,destination, source_area,levy) - values(#{site},#{declarationNo},#{itemNo,jdbcType=INTEGER},#{hsCode},#{hsCodeDesc},#{qty,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{unitPrice,jdbcType=DECIMAL},#{totalPrice,jdbcType=DECIMAL},#{currency},#{madeArea},#{destination}, + values(#{site},#{declarationNo},#{itemNo,jdbcType=INTEGER},#{hsCode},#{hsCodeDesc},#{brand,jdbcType=NVARCHAR},#{qty,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{unitPrice,jdbcType=DECIMAL},#{totalPrice,jdbcType=DECIMAL},#{currency},#{madeArea},#{destination}, #{sourceArea},#{levy}) @@ -1079,6 +1079,15 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no group by b.hsCodeDesc + +