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 eb18a996..08395c7b 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 @@ -2598,21 +2598,26 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } logger.info("OFS销售出库单同步U8C销售订单,目标拉取时间:" + calculateYesterdayStr); - for (int i = 0; i <= 23; i++) { - String iStr = null; - if (i <= 9) { - iStr = "0" + i; - } else { - iStr = String.valueOf(i); - } - String startTime = calculateYesterdayStr + " " + iStr + ":00:00"; - String endTime = calculateYesterdayStr + " " + iStr + ":59:59"; + StartAndEndVo startAndEndVo = new StartAndEndVo(); + startAndEndVo.setStart_time(calculateYesterdayStr + " 00:00:00"); + startAndEndVo.setEnd_time(calculateYesterdayStr + " 23:59:59"); + startAndEnd.add(startAndEndVo); - StartAndEndVo startAndEndVo = new StartAndEndVo(); - startAndEndVo.setStart_time(startTime); - startAndEndVo.setEnd_time(endTime); - startAndEnd.add(startAndEndVo); - } +// for (int i = 0; i <= 23; i++) { +// String iStr = null; +// if (i <= 9) { +// iStr = "0" + i; +// } else { +// iStr = String.valueOf(i); +// } +// String startTime = calculateYesterdayStr + " " + iStr + ":00:00"; +// String endTime = calculateYesterdayStr + " " + iStr + ":59:59"; +// +// StartAndEndVo startAndEndVo = new StartAndEndVo(); +// startAndEndVo.setStart_time(startTime); +// startAndEndVo.setEnd_time(endTime); +// startAndEnd.add(startAndEndVo); +// } return startAndEnd; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 4900a5a2..d976a45e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -142,7 +142,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } }, "执行插件:" + getPluginName()); thread.start(); - + if (requestJson != null && requestJson.get("type") != null && ProfilesActiveConstant.TYPE_DETAIL_ERROR.equals(requestJson.get("type"))) { try { thread.join(); @@ -2332,21 +2332,26 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } logger.info("OFS销售出库单同步U8C销售订单,目标拉取时间:" + calculateYesterdayStr); - for (int i = 0; i <= 23; i++) { - String iStr = null; - if (i <= 9) { - iStr = "0" + i; - } else { - iStr = String.valueOf(i); - } - String startTime = calculateYesterdayStr + " " + iStr + ":00:00"; - String endTime = calculateYesterdayStr + " " + iStr + ":59:59"; + StartAndEndVo startAndEndVo = new StartAndEndVo(); + startAndEndVo.setStart_time(calculateYesterdayStr + " 00:00:00"); + startAndEndVo.setEnd_time(calculateYesterdayStr + " 23:59:59"); + startAndEnd.add(startAndEndVo); - StartAndEndVo startAndEndVo = new StartAndEndVo(); - startAndEndVo.setStart_time(startTime); - startAndEndVo.setEnd_time(endTime); - startAndEnd.add(startAndEndVo); - } +// for (int i = 0; i <= 23; i++) { +// String iStr = null; +// if (i <= 9) { +// iStr = "0" + i; +// } else { +// iStr = String.valueOf(i); +// } +// String startTime = calculateYesterdayStr + " " + iStr + ":00:00"; +// String endTime = calculateYesterdayStr + " " + iStr + ":59:59"; +// +// StartAndEndVo startAndEndVo = new StartAndEndVo(); +// startAndEndVo.setStart_time(startTime); +// startAndEndVo.setEnd_time(endTime); +// startAndEnd.add(startAndEndVo); +// } return startAndEnd; } 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 f1f2c6d0..38120337 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 @@ -1,5 +1,6 @@ package com.hzya.frame.plugin.lets.plugin.sales; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.WebappApplication; import com.hzya.frame.plugin.lets.ofs.dao.ITocofsSaleoutDetailedDao; import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity; @@ -97,10 +98,13 @@ class SoSaleOutPluginInitializerToCTest { try { // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-18 00:00:00", "2024-10-18 23:59:59"); - String code = "LETS-SH2024052100015139"; - soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran"); +// String code = "LETS-SH2024052100015139"; +// soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran"); // soSaleOutPluginInitializerToC.startImplementStockByTimeAndTran("2024-10-22 00:00:00", "2024-10-22 23:59:59"); + + JSONObject jsonObject = new JSONObject(); + soSaleOutPluginInitializerToC.executeBusiness(jsonObject); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index dcdadc30..1da8c351 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -1,5 +1,6 @@ package com.hzya.frame.plugin.lets.plugin.sales; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.WebappApplication; import com.hzya.frame.plugin.lets.queryvo.StartAndEndVo; import org.junit.jupiter.api.Test; @@ -40,7 +41,10 @@ public class SoSaleReturnPluginInitializerToCTest { try { - soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-10-21 00:00:00", "2024-10-21 23:59:59"); +// soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-10-21 00:00:00", "2024-10-21 23:59:59"); + + JSONObject jsonObject = new JSONObject(); + soSaleReturnPluginInitializerToC.executeBusiness(jsonObject); } catch (Exception e) { e.printStackTrace(); }