From b01de5e5de3cfb5fd41750ad413ad30ea96f02df Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 11 Mar 2025 10:53:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9Asku=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A1=B9=EF=BC=88?= =?UTF-8?q?DAGSGL=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/base/SKUPluginInitializer.java | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java index cf3dfe38..786becab 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java @@ -10,12 +10,14 @@ import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.lets.constant.OverallConstant; import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant; import com.hzya.frame.plugin.lets.dao.IBdInvbasdocDao; +import com.hzya.frame.plugin.lets.entity.BdDefdocEntity; import com.hzya.frame.plugin.lets.entity.BdInvbasdocEntity; import com.hzya.frame.plugin.lets.entity.BdInvclEntity; import com.hzya.frame.plugin.lets.ofsvo.QueryOfsSKURequestVO; import com.hzya.frame.plugin.lets.u8cdto.InvBasDocVO; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; +import com.hzya.frame.plugin.lets.util.QueryU8CEntityUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; import com.hzya.frame.plugin.lets.util.pushData.Attribute; import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode; @@ -28,6 +30,7 @@ import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -97,6 +100,9 @@ public class SKUPluginInitializer extends PluginBaseEntity { @Autowired private IBdInvbasdocDao bdInvbasdocDao; + @Autowired + private QueryU8CEntityUtil queryU8CEntityUtil; + @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { try { @@ -157,7 +163,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { //分组排序, List sortSkuList = groupAndSort(ofsskuList); - //过滤日志 + //过滤日志,过滤公司 List filterSkus = filterData(sortSkuList); if (filterSkus.size() == 0) { return; @@ -189,7 +195,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { //分组排序, List sortSkuList = groupAndSort(ofsskuList); - //过滤日志 + //过滤日志,过滤公司 List filterSkus = filterData(sortSkuList); if (filterSkus.size() == 0) { Assert.state(false, "根据OFS SKU主档编码：{}，已被推送成功，请勿重新推送。", split[0]); @@ -223,7 +229,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { //分组排序, List sortSkuList = groupAndSort(ofsskuList); - //过滤日志 + //过滤日志,过滤公司 List filterSkus = filterData(sortSkuList); if (filterSkus.size() == 0) { Assert.state(false, "根据期间：{} - {} 内询到OFS系统中SKU主档信息已全部推送，请勿重新推送。"); @@ -237,7 +243,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { } /** - * 过滤成功日志 + * 过滤成功日志，过滤公司（根据U8C自定义档案） * rootAppPk * [code]_[lastUpdated] * @@ -247,6 +253,12 @@ public class SKUPluginInitializer extends PluginBaseEntity { public List filterData(List ofsskuList) { List filterSkus = new ArrayList<>(); for (OFSSKUSearchResponse.OFSSKU ofssku : ofsskuList) { + + //过滤公司 + boolean b = filterCorp(ofssku); + if (b) { + continue; + } String rootAppPk = ofssku.getCode().trim() + "_" + ofssku.getLastUpdated(); boolean isExis = true; IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); @@ -264,11 +276,17 @@ public class SKUPluginInitializer extends PluginBaseEntity { } return filterSkus; } -// public static void main(String[] args) { -// String brandCode="I'M MEME".replace("'", "\\'"); -// System.out.println(brandCode); -// -// } + + /** + * 根据自定义档案过滤公司 + * @return true 在要被过滤的列表，false 不要被过滤的列表 + */ + private boolean filterCorp(OFSSKUSearchResponse.OFSSKU ofssku) { + String skuCompanyCode = ofssku.getCompanyCode(); + List defdocEntityList = queryU8CEntityUtil.queryBdDefDocByListCode("DAGSGL"); + List collect = defdocEntityList.stream().map(index -> index.getDoccode()).collect(Collectors.toList()); + return collect.contains(skuCompanyCode); + } /** * 推送 @@ -315,9 +333,9 @@ public class SKUPluginInitializer extends PluginBaseEntity { //invshortname 存货简称 parentvo.setInvshortname(sku.getName().replace("'", "\'\'")); //pk_invcl 分类,没有存货分类的时候，默认“YD001”,可能是虚拟组套 - if(null==sku.getCInvCCode()||"".equals(sku.getCInvCCode())){ + if (null == sku.getCInvCCode() || "".equals(sku.getCInvCCode())) { parentvo.setPk_invcl("YD001"); - }else { + } else { parentvo.setPk_invcl(sku.getCInvCCode()); } @@ -383,11 +401,11 @@ public class SKUPluginInitializer extends PluginBaseEntity { logger.error("推送U8C，丽知：OFS货品档案--->U8C货品档案失败，失败原因：" + e); //失败 ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - String ErrMessage=""; + String ErrMessage = ""; if (reusltStrDto != null) { ErrMessage = "推送U8C，丽知：OFS货品档案--->U8C货品档案失败，失败原因：" + reusltStrDto.getErrormsg(); - }else { - ErrMessage=e.getMessage(); + } else { + ErrMessage = e.getMessage(); } //失败 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();