diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java index e85a4092..03541dda 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java @@ -158,9 +158,15 @@ public class SKUClassPluginInitializer extends PluginBaseEntity { queryOfsSKUClassRequestVO.setLastUpdated_start(startTimeStr); queryOfsSKUClassRequestVO.setLastUpdated_end(endTimeStr); List skuClasses = querySkuClass(queryOfsSKUClassRequestVO); + if (skuClasses.size() == 0) { + return; + } //过滤日志 List filterSKUClasss = filterData(skuClasses); + if (filterSKUClasss.size() == 0) { + return; + } //推送 implement(filterSKUClasss); @@ -174,14 +180,20 @@ public class SKUClassPluginInitializer extends PluginBaseEntity { /** * 按分类名称 */ - public void start(String className) { + public void start(String classCode) { try { QueryOfsSKUClassRequestVO queryOfsSKUClassRequestVO = new QueryOfsSKUClassRequestVO(); - queryOfsSKUClassRequestVO.setCInvCCode(className); + queryOfsSKUClassRequestVO.setCInvCCode(classCode); List skuClasses = querySkuClass(queryOfsSKUClassRequestVO); + if(skuClasses.size()==0){ + Assert.state(false, "根据OFS分类编码：{}，未查询到存货分类，请检查入参或者OFS存货分类。", skuClasses); + } //过滤日志 List filterGoodsClass = filterData(skuClasses); + if(filterGoodsClass.size()==0){ + Assert.state(false, "根据OFS分类编码：{}，已被推送成功，请勿重新推送。", skuClasses); + } //推送 implement(filterGoodsClass); @@ -204,8 +216,15 @@ public class SKUClassPluginInitializer extends PluginBaseEntity { queryOfsSKUClassRequestVO.setLastUpdated_start(start); queryOfsSKUClassRequestVO.setLastUpdated_end(end); List skuClasses = querySkuClass(queryOfsSKUClassRequestVO); + if(skuClasses.size()==0){ + Assert.state(false, "根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到OFS存货分类。", startTime, endTime); + } //过滤日志 List filterGoodsClass = filterData(skuClasses); + if (filterGoodsClass.size()==0) { + Assert.state(false, "根据日期期间[开始时间]-[结束时间]：{}-{}，该调期已被推送成功，请勿重新推送。", startTime, endTime); + + } //推送 implement(filterGoodsClass); 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 92c58702..8af94543 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 @@ -18,13 +18,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; /** * OFS->U8C货品档案 新增，修改，删除 * add by zyd 20240802 - * + *

* 存货基本档案新增 /u8cloud/api/uapbd/invbasdoc/insert * 存货基本档案修改 /u8cloud/api/uapbd/invbasdoc/update * 存货基本档案封存 /u8cloud/api/uapbd/invbasdoc/seal @@ -75,6 +77,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { @Autowired private OfsUnifiedService ofsUnifiedService; + @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { return null; @@ -94,19 +97,11 @@ public class SKUPluginInitializer extends PluginBaseEntity { String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); QueryOfsSKURequestVO queryOfsSKURequestVO = new QueryOfsSKURequestVO(); -// queryOfsSKURequestVO.setCreated_start(startTimeStr); -// queryOfsSKURequestVO.setCreated_end(endTimeStr); -// queryOfsSKURequestVO.setCreated_start("2023-10-15 00:00:00"); -// queryOfsSKURequestVO.setCreated_end("2023-10-21 23:59:59"); -// queryOfsSKURequestVO.setCompanyCode(""); - queryOfsSKURequestVO.setPageNo("1"); - queryOfsSKURequestVO.setPageSize("500"); + queryOfsSKURequestVO.setLastUpdated_start(startTimeStr); + queryOfsSKURequestVO.setLastUpdated_end(endTimeStr); queryOfsSKUs(queryOfsSKURequestVO); - - - } catch (Exception e) { logger.error("丽知：OFS货品档案--->U8C货品档案,start()方法报错：", e); } @@ -115,10 +110,12 @@ public class SKUPluginInitializer extends PluginBaseEntity { /** * 按分类名称 */ - public void start(String goodsName) { + public void start(String goodsCode) { try { - QueryOfsSKURequestVO queryOfsGoodsRequestVO = new QueryOfsSKURequestVO(); - + QueryOfsSKURequestVO queryOfsSKURequestVO = new QueryOfsSKURequestVO(); + queryOfsSKURequestVO.setCode(goodsCode); + List ofsskuList = queryOfsSKUs(queryOfsSKURequestVO); + System.out.println(ofsskuList); } catch (Exception e) { logger.error("丽知：丽知：OFS货品档案--->U8C货品档案,start(String goodsName)方法报错：", e); @@ -139,9 +136,8 @@ public class SKUPluginInitializer extends PluginBaseEntity { QueryOfsSKURequestVO queryOfsSKURequestVO = new QueryOfsSKURequestVO(); queryOfsSKURequestVO.setLastUpdated_start(start); queryOfsSKURequestVO.setLastUpdated_end(end); - queryOfsSKURequestVO.setPageNo("1"); - queryOfsSKURequestVO.setPageSize("500"); - queryOfsSKUs(queryOfsSKURequestVO); + List ofsskuList = queryOfsSKUs(queryOfsSKURequestVO); + System.out.println(ofsskuList); } catch (Exception e) { logger.error("丽知：丽知：OFS货品档案--->U8C货品档案,start(String startTime, String endTime)方法报错：", e); @@ -152,16 +148,39 @@ public class SKUPluginInitializer extends PluginBaseEntity { * 查询OFS SKU档案 * status 0禁用 1启用 */ - public void queryOfsSKUs(QueryOfsSKURequestVO queryOfsGoodsRequestVO) throws Exception { + public List queryOfsSKUs(QueryOfsSKURequestVO queryOfsSKURequestVO) throws Exception { + + int pageNo = 1; + int pageSize = 500; + + List all = new ArrayList<>(); + InterfaceParamByU8CApiDto interfaceParamDto = new InterfaceParamByU8CApiDto(); interfaceParamDto.setApi("ofs.sku.search"); - queryOfsGoodsRequestVO.setClientCode("LETS"); - interfaceParamDto.setData(JSON.toJSONString(queryOfsGoodsRequestVO)); - OFSSKUSearchResponse ofsskuSearchResponse =(OFSSKUSearchResponse) ofsUnifiedService.unifiedByU8CApi(interfaceParamDto); - System.out.println(ofsskuSearchResponse); + queryOfsSKURequestVO.setClientCode("LETS"); + queryOfsSKURequestVO.setPageNo(String.valueOf(pageNo)); + queryOfsSKURequestVO.setPageSize(String.valueOf(pageSize)); + interfaceParamDto.setData(JSON.toJSONString(queryOfsSKURequestVO)); + OFSSKUSearchResponse ofsskuSearchResponse = (OFSSKUSearchResponse) ofsUnifiedService.unifiedByU8CApi(interfaceParamDto); + all.addAll(ofsskuSearchResponse.getData()); + + int count = ofsskuSearchResponse.getData().size(); + + while (count >= pageSize) {//>=500,可能还有下一页。 + //还有下一页 + pageNo++; + queryOfsSKURequestVO.setPageNo(String.valueOf(pageNo)); + interfaceParamDto.setData(JSON.toJSONString(queryOfsSKURequestVO)); + OFSSKUSearchResponse ofsskuSearchResponse1 = (OFSSKUSearchResponse) ofsUnifiedService.unifiedByU8CApi(interfaceParamDto); + all.addAll(ofsskuSearchResponse1.getData()); + count = ofsskuSearchResponse1.getData().size(); + } + if (all == null || all.size() == 0) { + return null; + } + return all; } - } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index 754f760a..941e0f9d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -174,12 +174,12 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); if(transferOutOrder.size()==0){ - Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单", stockoutNo); + Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单：{}", stockoutNo); } //过滤成功日志 List filterTransferOutOrders = filterData(transferOutOrder); if(filterTransferOutOrders.size()==0){ - Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单已被推送成功，请勿重新推送", stockoutNo); + Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo); } //推送U8C implement(filterTransferOutOrders); @@ -306,9 +306,9 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { parentvo.setVnote(ofsTranseferOrder.getHeader().getNotes()); // //pk_defdoc1 ofs调出店铺 -// parentvo.setPk_defdoc1(ofsTranseferOrder.getHeader().getCode()); + parentvo.setPk_defdoc1(ofsTranseferOrder.getHeader().getStoreCode()); // //pk_defdoc4 ofs调入店铺 -// parentvo.setPk_defdoc4(ofsTranseferOrder.getHeader().getCode()); + parentvo.setPk_defdoc4(ofsTranseferOrder.getHeader().getToStoreCode()); //pk_defdoc17 来源系统 parentvo.setPk_defdoc17(ProfilesActiveConstant.sourceSystem1); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/BaseTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/BaseTest.java index 7951dc9b..af6efe31 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/BaseTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/BaseTest.java @@ -25,7 +25,7 @@ public class BaseTest { } @Test public void t01(){ - skuPluginInitializer.start("2024-08-20","2024-08-20"); + skuPluginInitializer.start("2024-08-28","2024-08-29"); } ////////////////////////////////////////////////////////////////////////////////////SKU自动分配 @Test @@ -40,7 +40,7 @@ public class BaseTest { } @Test public void t21(){ - skuClassPluginInitializer.start("ZN001"); + skuClassPluginInitializer.start("YD001"); } @Test public void t22(){ diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java index 548da241..e4ac1c6a 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java @@ -40,7 +40,7 @@ public class TransferTest { @Test public void t10(){ - transferOutPluginInitializer.start("LETS-SH2024082700000004"); + transferOutPluginInitializer.start("LETS-SH2024082800000001"); } @Test diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java index 4795a17e..42907beb 100644 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java @@ -24,10 +24,14 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics { private String companyCode; /** 库存地点编码 */ private String facilityCode; + /** 原库存地点店铺 */ + private String storeCode; /** 目标货主编码 */ private String toCompanyCode; /** 目标库存地点编码 */ private String toFacilityCode; + /** 目标库存地点店铺 */ + private String toStoreCode; /** 订单编码 */ private String code; /** 移动单类型 */