From abf1c5eaf4c6715b4ca8cf882e3a81017adb06df Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 24 Sep 2024 10:12:23 +0800 Subject: [PATCH] =?UTF-8?q?```=E6=9B=B4=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=A1=AE=E4=BF=9D=E5=BA=93=E5=AD=98=E5=92=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E6=8F=92=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=A1=8C=E4=B8=BA=E5=BA=93=E5=AD=98=E5=92=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E6=8F=92=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=B7=B2=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BB=A5=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8B=E7=9A=84=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=82=E5=9C=A8`ConsignmachiningInReturn`?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=EF=BC=88?= =?UTF-8?q?`shipAt`=EF=BC=89=E7=8E=B0=E5=9C=A8=E7=94=A8=E4=BA=8E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E8=80=8C=E9=9D=9E=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=88`closedAt`=EF=BC=89=E3=80=82=E8=80=8C?= =?UTF-8?q?=E5=9C=A8`SoSaleReturnPluginInitializerToC`=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=88`created`=EF=BC=89?= =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E5=B7=B2=E8=A2=AB=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=88`closedAt`=EF=BC=89=E5=8F=96?= =?UTF-8?q?=E4=BB=A3=E3=80=82=E8=BF=99=E4=BA=9B=E6=9B=B4=E6=94=B9=E7=A1=AE?= =?UTF-8?q?=E4=BF=9D=E6=8F=92=E4=BB=B6=E7=8E=B0=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E4=B8=8E=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E3=80=82=20```?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outsourc/ConsignmachiningInReturn.java | 4 ++-- .../SoSaleReturnPluginInitializerToC.java | 4 ++-- .../SoSaleReturnPluginInitializerToCTest.java | 19 +++++++++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java index eefd417d..b797c1fb 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java @@ -187,8 +187,8 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { //OFS采退出库 List returnGoodHeaderDetailsDataDtoArrayList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); - queryOfsSoSaleOutVo.setClosedAt_start(startTime); - queryOfsSoSaleOutVo.setClosedAt_end(endTime); + queryOfsSoSaleOutVo.setShipAt_start(startTime); + queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); 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 489fe4a5..0f6efa30 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 @@ -187,8 +187,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { List returnGoodHeaderDetailsDataDtoArrayList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); - queryOfsSoSaleOutVo.setCreated_start(startTime); - queryOfsSoSaleOutVo.setCreated_end(endTime); + queryOfsSoSaleOutVo.setClosedAt_start(startTime); + queryOfsSoSaleOutVo.setClosedAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); //2024年8月22日 14:02:13 已经和O确认，这个字段取消传递！ 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 2a500cad..c9a58f7a 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,12 +1,15 @@ package com.hzya.frame.plugin.lets.plugin.sales; import com.hzya.frame.WebappApplication; +import com.hzya.frame.plugin.lets.queryvo.StartAndEndVo; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.util.List; + /** * @Author：liuyang * @Package：com.hzya.frame.plugin.lets.plugin.sales @@ -25,11 +28,15 @@ public class SoSaleReturnPluginInitializerToCTest { @Test public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); - try { - String code = "LETS-RE2024091400000001"; - soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran"); - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// String code = "LETS-RE2024091400000001"; +// soSaleReturnPluginInitializerToC.startImplementByCode(code, "tran"); +// } catch (Exception e) { +// e.printStackTrace(); +// } + + + List startAndEndVos = soSaleReturnPluginInitializerToC.calculateCalculateEntireDayPeriod(null); + soSaleReturnPluginInitializerToC.startImplementStockByTime(startAndEndVos.get(0).getStart_time(), startAndEndVos.get(0).getEnd_time()); } } \ No newline at end of file