From 26e702367454b88f20cc1e5e9252bcbdf73fbdf7 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 11 Sep 2024 17:40:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E6=88=90?= =?UTF-8?q?=E5=A5=97=E4=BB=B6=E6=8F=92=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/base/KitPluginInitializer.java | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java index f8b27ac7..3f65f27f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java @@ -1,5 +1,7 @@ package com.hzya.frame.plugin.lets.plugin.base; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; @@ -133,6 +135,26 @@ public class KitPluginInitializer extends PluginBaseEntity { public void start() { try { + //获取当前时间 + Date currentDate = new Date(); + Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10); + Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2); + String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"); + String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); + QueryOfsKitRequestVO queryOfsKitRequestVO = new QueryOfsKitRequestVO(); + queryOfsKitRequestVO.setLastUpdated_start(startTimeStr); + queryOfsKitRequestVO.setLastUpdated_end(endTimeStr); + List ofsKits = queryOfsKits(queryOfsKitRequestVO); + if (ofsKits.size() == 0) { + return; + } + //过滤 + List filterKits = filterData(ofsKits); + if(filterKits.size()==0){ + return; + } + //实现 + implement(filterKits); } catch (Exception e) { logger.error("丽知：OFS实物组套--->U8C成套件档案,start()方法报错：", e); } @@ -158,8 +180,26 @@ public class KitPluginInitializer extends PluginBaseEntity { } } - public void start(String startTime, String endTim) { + public void start(String startTime, String endTime) { try { + Date business_start = DateUtil.parse(startTime); + Date business_end = DateUtil.parse(endTime); + String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; + String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; + QueryOfsKitRequestVO queryOfsKitRequestVO = new QueryOfsKitRequestVO(); + queryOfsKitRequestVO.setLastUpdated_start(start); + queryOfsKitRequestVO.setLastUpdated_end(end); + List ofsKits = queryOfsKits(queryOfsKitRequestVO); + if(ofsKits.size()==0){ + Assert.state(false, "丽知：OFS实物组套--->U8C成套件档案根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到OFS实物组套", startTime, endTime); + } + //过滤 + List filterKits = filterData(ofsKits); + if(filterKits.size()==0){ + Assert.state(false, "丽知：OFS实物组套--->U8C成套件档案根据日期期间[开始时间]-[结束时间]：{}-{}，该期间OFS实物组套已被推送成功，请勿重新推送", startTime, endTime); + } + //实现 + implement(filterKits); } catch (Exception e) { logger.error("丽知：OFS实物组套--->U8C成套件档案,start(String startTime, String endTim)方法报错：", e); } From 0feefe2a4dcc8dbdfcf022ebfd28860832472d2c Mon Sep 17 00:00:00 2001 From: zhengyf Date: Thu, 12 Sep 2024 14:00:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjust/AdjustInZZPluginInitializer.java | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index f98053bd..cbd45c7c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -11,12 +11,16 @@ import com.hzya.frame.plugin.lets.constant.OverallConstant; import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant; import com.hzya.frame.plugin.lets.dao.IBdRdclDao; import com.hzya.frame.plugin.lets.dao.IBdSetpartDao; +import com.hzya.frame.plugin.lets.entity.BdInvbasdocEntity; +import com.hzya.frame.plugin.lets.entity.BdInvmandocEntity; +import com.hzya.frame.plugin.lets.entity.BdSetpartEntity; import com.hzya.frame.plugin.lets.ofsvo.QueryOfsAdjustOrderRequestVO; import com.hzya.frame.plugin.lets.ofsvo.QueryOfsStockinOrderRequestVO; import com.hzya.frame.plugin.lets.u8cdto.GeneralBillVO_4ADto; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.u8cdto.SpecialbillVO; 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; @@ -89,6 +93,8 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { @Autowired private OfsUnifiedService ofsUnifiedService; + @Autowired + private QueryU8CEntityUtil queryU8CEntityUtil; @Autowired private IBdRdclDao iBdRdclDao; @@ -273,23 +279,32 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { */ public void implement(List filterStockinOrders) { for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) { - System.out.println(stockinOrder); String mapStr = ""; String format = ""; String response = ""; String ofsCode = ""; try { + + StockinOrderSearchResponse.StockinOrder.StockinH ofsHeader = stockinOrder.getHeader(); + System.out.println(ofsHeader); //主表 SpecialbillVO specialbillVO = new SpecialbillVO(); SpecialbillVO.Parentvo parentvo = new SpecialbillVO.Parentvo(); //pk_corp 公司 + parentvo.setPk_corp(ofsHeader.getCompanyCode()); //dbilldate 单据日期 + format = ofsHeader.getCreated(); + parentvo.setDbilldate(StringUtils.substring(format, 0, 10)); //coperatorid 制单人 + parentvo.setCoperatorid("tbadmin"); //cinwarehouseid 入库仓库(审批，3.6及上版本支持) + parentvo.setCinwarehouseid(ofsHeader.getFacilityCode()); + //vnote 备注 + parentvo.setVnote(ofsHeader.getNote()); - + queryBdSetPart(null,null); //子表 List childrenvo =new ArrayList<>(); @@ -434,4 +449,36 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { List data = ofsAdjustOrderSearchResponse.getData(); return data; } + + + /** + * 查询成套件信息,因为是调整入库，只有套件信息 + * @param skuCode ofs sku编码 + * @param pkCorp 公司编码 + * 套件 存货管理档案的主键 + */ + public void queryBdSetPart(String skuCode,String pkCorp){ + + //查询存货基本档案 + BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(skuCode); + if (bdInvbasdocEntity == null) { + Assert.state(false,"根据存货编码：{},查询存货基本档案失败，请检查。",skuCode); + } + + //查询存货管理档案 + BdInvmandocEntity bdInvmandocEntity = queryU8CEntityUtil.queryBdInvmandocByPkInvbasdocAndPkCorp(bdInvbasdocEntity.getPkInvbasdoc(), pkCorp); + if (bdInvmandocEntity == null) { + Assert.state(false,"根据存货编码：{},存货基本档案主键：{}，公司编码：{},查询存货管理档案失败，请检查是否分配。",skuCode,bdInvbasdocEntity.getPkInvbasdoc(),pkCorp); + } + //查询配件信息 + BdSetpartEntity bdSetpartEntity = new BdSetpartEntity(); + bdSetpartEntity.setPkInvmandocpart(bdInvmandocEntity.getPkInvmandoc()); + bdSetpartEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); + List query = bdSetpartDao.query(bdSetpartEntity); + if(query.size()==0){ + Assert.state(false,"OFS调整入库（组装）,查询"); + } + + + } }