diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java index 01196e4c..baaaa08c 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssDeclarationHeaderData.java @@ -61,4 +61,5 @@ public class EcssDeclarationHeaderData extends EcssDeclarationHeader{ private String xdremark; private String declarationWeight; private String destination; + private Boolean highPalletFlag; } diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssTemplate.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssTemplate.java index b90c8c18..f413a8d6 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssTemplate.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssTemplate.java @@ -49,6 +49,7 @@ public class EcssTemplate extends QueryPage { private String remark; private Boolean boxChange; private String customName; + private Boolean highPalletFlag; /** * 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 2524b974..b5ceee3a 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 @@ -2458,10 +2458,10 @@ public class CoDelServiceImpl implements CoDelService { if (data.getMaterial()!=null && data.getMaterial()) { template.addVar("RFIDBase", "RFID Base Material"); template.addVar("HSCode", "& H.S.Code:"+stringInput(data.getHsCode())); - template.addVar("volume", !palletHeaderData.isPresent()?"":palletHeaderData.map(ecssCoDelPalletHeaderData -> + /* template.addVar("volume", !palletHeaderData.isPresent()?"":palletHeaderData.map(ecssCoDelPalletHeaderData -> ecssCoDelPalletHeaderData.getLength().setScale(2, RoundingMode.HALF_UP) + "*" + ecssCoDelPalletHeaderData.getWidth().setScale(2, RoundingMode.HALF_UP) + "*" - + ecssCoDelPalletHeaderData.getHeight().setScale(2, RoundingMode.HALF_UP) + "m").orElse("")); + + ecssCoDelPalletHeaderData.getHeight().setScale(2, RoundingMode.HALF_UP) + "m").orElse(""));*/ } // 欧洲地区需要 if (data.getPackaging()!=null && data.getPackaging()) { @@ -2498,6 +2498,12 @@ public class CoDelServiceImpl implements CoDelService { totalVolume = calculateVolumeByMaterials(notifyHeader); } template.addVar("Measurement", totalVolume); + if (data.getHighPalletFlag()!=null && data.getHighPalletFlag() && palletHeaderData.isPresent()) { + template.addVar("volume", palletHeaderData.map(ecssCoDelPalletHeaderData -> + ecssCoDelPalletHeaderData.getLength().setScale(2, RoundingMode.HALF_UP) + + "*" + ecssCoDelPalletHeaderData.getWidth().setScale(2, RoundingMode.HALF_UP) + "*" + + ecssCoDelPalletHeaderData.getHeight().setScale(2, RoundingMode.HALF_UP)).orElse("")); + } template.addListVarAll(exportList); } diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index c10ef295..6a2943df 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -995,11 +995,11 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no insert into ecss_template (customName,site,buNo,name,type,upc,so,origin,palletWeight,material,hsCode,packaging,itemNo, kgs,shippingMark,boxChange,hsCodeDesc,contractFlag,hsCodeDescType,goodsLabel,hsCodeFlag,shippingMode,CreateBy,CreateDate, - salesMethod,currency,madeArea,sendPort,shipper,voyage,deliveryGoodsDate,shippingDate,fscWeight, remark) + salesMethod,currency,madeArea,sendPort,shipper,voyage,deliveryGoodsDate,shippingDate,fscWeight, remark,highPalletFlag) values(#{customName,jdbcType=NVARCHAR},#{site},#{buNo},#{name},#{type},#{upc},#{so},#{origin},#{palletWeight},#{material},#{hsCode},#{packaging}, #{itemNo},#{kgs},#{shippingMark},#{boxChange}, #{hsCodeDesc},#{contractFlag},#{hsCodeDescType},#{goodsLabel},#{hsCodeFlag},#{shippingMode},#{createBy},GetDate(), - #{salesMethod},#{currency},#{madeArea},#{sendPort},#{shipper},#{voyage},#{deliveryGoodsDate},#{shippingDate},#{fscWeight},#{remark}) + #{salesMethod},#{currency},#{madeArea},#{sendPort},#{shipper},#{voyage},#{deliveryGoodsDate},#{shippingDate},#{fscWeight},#{remark},#{highPalletFlag}) @@ -1009,7 +1009,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no contractFlag=#{contractFlag},hsCodeDescType=#{hsCodeDescType},goodsLabel=#{goodsLabel},hsCodeFlag=#{hsCodeFlag}, shippingMode=#{shippingMode},UpdateDate=GetDate(),UpdateBy=#{updateBy},customName=#{customName,jdbcType=NVARCHAR},salesMethod= #{salesMethod}, currency= #{currency},madeArea= #{madeArea},sendPort= #{sendPort},shipper= #{shipper},remark= #{remark}, - voyage= #{voyage},deliveryGoodsDate= #{deliveryGoodsDate},shippingDate= #{shippingDate},fscWeight=#{fscWeight} + voyage= #{voyage},deliveryGoodsDate= #{deliveryGoodsDate},shippingDate= #{shippingDate},fscWeight=#{fscWeight},highPalletFlag=#{highPalletFlag} where buNo=#{buNo} and name=#{nameNative}