diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index db0353dd..877eacd8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -260,7 +260,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); // queryOfsSoSaleOutVo.setCompanyCode("SHLZ"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); @@ -306,7 +306,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 // queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); @@ -346,7 +346,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); //2024年8月30日 10:41:55 如果按编码查询,是否应该考虑仅查询已发货的数据? queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 0ab843c7..5e1a9279 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -237,7 +237,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); @@ -285,7 +285,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); @@ -326,11 +326,11 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); -// queryOfsSoSaleOutVo.setStatus(900L); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); + queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); -// queryOfsSoSaleOutVo.setStoreCode(tobShop); + queryOfsSoSaleOutVo.setStoreCode(tobShop); queryOfsSoSaleOutVo.setCode(code); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数:{}", headerDetailsDtoList.size()); @@ -379,7 +379,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE,NEIBULINGYONG,INPURCHASE,HUOFAN"); queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 // queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index bab6e286..cd510979 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -36,7 +36,7 @@ spring: # use-suffix-pattern: true profiles: # active: @profileActive@ - active: lets + active: letsprod # active: @profile.active@ # active: dev servlet: diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java index 61358291..b124b0e0 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java @@ -82,9 +82,11 @@ public class SoSaleOutPluginInitializerToBTest { // soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024102300053750", "tran"); // soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-23 16:09:59", "2024-10-23 16:10:01"); -// String aaa = "LETS-SH2024102300043720"; +// String aaa = "LETS-SH2024103100016169"; // soSaleOutPluginInitializerToB.startImplementByCode(aaa, "stock"); - soSaleOutPluginInitializerToB.startImplementByTranTime("2024-10-28 00:00:00", "2024-10-28 23:59:59"); +// soSaleOutPluginInitializerToB.startImplementByTranTime("2024-10-28 00:00:00", "2024-10-28 23:59:59"); + + soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-31 14:48:41", "2024-10-31 14:48:41"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 3ceca42a..0caac45d 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -112,7 +112,7 @@ class SoSaleOutPluginInitializerToCTest { // String aaa = "LETS-SH2024102900016893"; // soSaleOutPluginInitializerToC.startImplementStockByCode(aaa, "tran"); -// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-30 00:00:00", "2024-10-30 23:59:59"); +// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-31 14:48:41", "2024-10-31 14:48:41"); } catch (Exception e) { e.printStackTrace(); } @@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest { // soSaleOutPluginInitializerToC.sendU8CTOCOrder("123446"); try { - soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024102600009446", "stock"); +// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock"); } catch (Exception e) { e.printStackTrace(); }