diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssHsCode.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssHsCode.java index 7033e039..b996d649 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssHsCode.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssHsCode.java @@ -30,6 +30,7 @@ public class EcssHsCode extends QueryPage { private String hsCodeDescEn; private String unit; + private String brand; /** * 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 737acc14..967c2c48 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 @@ -50,9 +50,9 @@ public interface CoDelMapper { List checkPart(@Param("site") String site, @Param("partNo") String partNo); List getPartNo(@Param("site") String site, @Param("partNo") String partNo, @Param("userName") String userName, @Param("buNo") String buNo); - - @Update("update Part set hsCode = #{hsCode}, hsCodeDesc = #{hsCodeDesc} where site = #{site} and part_no = #{partNo}") - void updatePartHsCode(@Param("site") String site, @Param("partNo") String partNo, @Param("hsCode") String hsCode, @Param("hsCodeDesc") String hsCodeDesc); + + @Update("update Part set hsCode = ISNULL(NULLIF(#{hsCode},''),hsCode), hsCodeDesc = ISNULL(NULLIF(#{hsCodeDesc},''),hsCodeDesc), brand = ISNULL(NULLIF(#{brand},'无'),brand) where site = #{site} and part_no = #{partNo}") + void updatePartHsCode(@Param("site") String site, @Param("partNo") String partNo, @Param("hsCode") String hsCode, @Param("hsCodeDesc") String hsCodeDesc, @Param("brand") String brand); List getPartInfo(@Param("site") String site, @Param("partNo") String partNo); 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 061d952a..f2dbfc41 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 @@ -432,18 +432,26 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } else { PartData partData = parts.getFirst(); detail.setPartNo(partData.getPartNo()); - if (StringUtils.isBlank(partData.getHsCode()) || StringUtils.isBlank(partData.getHsCodeDesc())) { + if (StringUtils.isBlank(partData.getHsCode()) || StringUtils.isBlank(partData.getHsCodeDesc()) + || StringUtils.isBlank(partData.getBrand()) || "无".equals(partData.getBrand())) { String hsCode = headerMap.containsKey("HS Code") ? getMergedCellValue(sheet, r, headerMap.get("HS Code")) : ""; String hsCodeDesc = headerMap.containsKey("申报品名") ? getMergedCellValue(sheet, r, headerMap.get("申报品名")) : ""; + String brand = ""; + if (headerMap.containsKey("品牌")) { + brand = getMergedCellValue(sheet, r, headerMap.get("品牌")); + } else if (headerMap.containsKey("Brand")) { + brand = getMergedCellValue(sheet, r, headerMap.get("Brand")); + } - if (StringUtils.isNotBlank(hsCode) || StringUtils.isNotBlank(hsCodeDesc)) { - coDelMapper.updatePartHsCode(site, partData.getPartNo(), hsCode, hsCodeDesc); + if (StringUtils.isNotBlank(hsCode) || StringUtils.isNotBlank(hsCodeDesc) || StringUtils.isNotBlank(brand)) { + coDelMapper.updatePartHsCode(site, partData.getPartNo(), hsCode, hsCodeDesc, brand); if (StringUtils.isNotBlank(hsCodeDesc)) { EcssHsCodeData hsCodeData = new EcssHsCodeData(); hsCodeData.setSite(site); hsCodeData.setBuNo(data.getBuNo()); hsCodeData.setHsCodeDesc(hsCodeDesc); + hsCodeData.setBrand(brand); List existHsCodes = coDelMapper.checkHsCodeDescData(hsCodeData); if (existHsCodes == null || existHsCodes.isEmpty()) { hsCodeData.setHsCode(hsCode); diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/entity/PartData.java b/src/main/java/com/xujie/sys/modules/orderIssure/entity/PartData.java index 3350b429..4eba3aaf 100644 --- a/src/main/java/com/xujie/sys/modules/orderIssure/entity/PartData.java +++ b/src/main/java/com/xujie/sys/modules/orderIssure/entity/PartData.java @@ -13,4 +13,5 @@ public class PartData extends Part { private String packageNo; private String hsCode; private String hsCodeDesc; + private String brand; } diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index c05e1654..1da52561 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -223,7 +223,7 @@ @@ -355,7 +355,7 @@ - insert into ecss_hsCode (Site,BuNo,HsCode,Remark,CreateBy,CreateDate,codeNo,hsCodeDesc,hsCodeDescEn,unit) - values(#{site},#{buNo},#{hsCode},#{remark},#{createBy},GetDate(),#{codeNo},#{hsCodeDesc},#{hsCodeDescEn},#{unit}) + insert into ecss_hsCode (Site,BuNo,HsCode,Remark,CreateBy,CreateDate,codeNo,hsCodeDesc,hsCodeDescEn,unit,brand) + values(#{site},#{buNo},#{hsCode},#{remark},#{createBy},GetDate(),#{codeNo},#{hsCodeDesc},#{hsCodeDescEn},#{unit},#{brand}) - update ecss_hsCode set Remark=#{remark} ,codeNo=#{codeNo},HsCode=#{hsCode},unit=#{unit} ,UpdateDate=GetDate(),UpdateBy=#{updateBy},hsCodeDescEn=#{hsCodeDescEn} + update ecss_hsCode set Remark=#{remark} ,codeNo=#{codeNo},HsCode=#{hsCode},unit=#{unit} ,brand=#{brand},UpdateDate=GetDate(),UpdateBy=#{updateBy},hsCodeDescEn=#{hsCodeDescEn} where site=#{site} and buNo=#{buNo} and hsCodeDesc=#{hsCodeDesc} @@ -822,7 +822,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no