From bb7ef33c9d24f8b0fee516130a85884fa1b0e7d7 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:41:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0API=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在SoSaleOutPluginInitializerToB和SoSaleOutPluginInitializerToC中，将内部指令类型从"SALES"扩展为"SALES,EXCHANGE,REISSUE"，以包含更多的销售订单类型 - 更新application-lets.yml中的letsofs配置，替换为正式环境的URL、appKey和secret - 在测试类中调整订单代码查询示例，更新为新的测试订单代码 --- .../sales/SoSaleOutPluginInitializerToB.java | 6 ++--- .../sales/SoSaleOutPluginInitializerToC.java | 6 ++--- .../src/main/resources/application-lets.yml | 14 ++++++++--- .../SoSaleOutPluginInitializerToBTest.java | 23 +++++++++++++------ .../SoSaleOutPluginInitializerToCTest.java | 5 ++-- 5 files changed, 35 insertions(+), 19 deletions(-) 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 617d9a19..d44d2874 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 @@ -255,7 +255,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); // queryOfsSoSaleOutVo.setCompanyCode("SHLZ"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); @@ -301,7 +301,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 // queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); @@ -341,7 +341,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); //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 54be2875..49ce31e3 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 @@ -212,7 +212,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setShipAt_start(startTime); queryOfsSoSaleOutVo.setShipAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); @@ -253,7 +253,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); // queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); @@ -306,7 +306,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setTradeSuccessAt_start(startTime); queryOfsSoSaleOutVo.setTradeSuccessAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); queryOfsSoSaleOutVo.setSourceOrderStatus("TRADE_FINISHED");//交易成功状态 // queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); diff --git a/buildpackage/src/main/resources/application-lets.yml b/buildpackage/src/main/resources/application-lets.yml index 8c350abd..7359fc36 100644 --- a/buildpackage/src/main/resources/application-lets.yml +++ b/buildpackage/src/main/resources/application-lets.yml @@ -38,7 +38,15 @@ cbs8: OA: data_source_code: yc_oa +#O测试 +#letsofs: +# url: http://39.98.58.229/api/edi/u8c/ofs/in +# appKey: 1023142858 +# secret: 382e4a2584027a36ac9431103 + + +#O正式 letsofs: - url: http://39.98.58.229/api/edi/u8c/ofs/in - appKey: 1023142858 - secret: 382e4a2584027a36ac9431103 \ No newline at end of file + url: http://39.98.168.188:30002/api/edi/u8c/ofs/in + appKey: 2097046829 + secret: 35282f251476a3af4f00c7b36 \ No newline at end of file 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 8dae366a..1022b1c6 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 @@ -2,6 +2,7 @@ package com.hzya.frame.plugin.lets.plugin.sales; import com.hzya.frame.WebappApplication; import com.hzya.frame.plugin.lets.util.AfterSalesOrderUtil; +import com.hzya.frame.plugin.lets.util.ShopTobOrToCUtil; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto; @@ -33,6 +34,9 @@ public class SoSaleOutPluginInitializerToBTest { @Autowired private AfterSalesOrderUtil afterSalesOrderUtil; + @Autowired + private ShopTobOrToCUtil shopTobOrToCUtil; + @Test public void startImplement() { // soSaleOutPluginInitializerToB.startImplement(null, null); @@ -60,13 +64,18 @@ public class SoSaleOutPluginInitializerToBTest { // e.printStackTrace(); // } - try { -// soSaleOutPluginInitializerToB.startImplementByTranTime("2024-09-12 14:04:00","2024-09-12 14:12:00"); -// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock"); +// try { +//// soSaleOutPluginInitializerToB.startImplementByTranTime("2024-09-12 14:04:00","2024-09-12 14:12:00"); +//// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092000000003", "stock"); +// +// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092600000009","stock"); +// } catch (Exception e) { +// e.printStackTrace(); +// } - soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024092600000009","stock"); - } catch (Exception e) { - e.printStackTrace(); - } +// String tobShop = shopTobOrToCUtil.getCommaShop("TOB"); +// System.out.println(tobShop); + +// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101700000270"); } } \ No newline at end of file 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 5ae64d33..2c9af82a 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 @@ -92,9 +92,8 @@ class SoSaleOutPluginInitializerToCTest { // queryOfsSoSaleOutVo.setCode("LETS-SO2024092500000018"); // ofsStandardUtil.getOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoArrayList, 1L); // System.out.println(headerDetailsDtoArrayList.get(0).getHeader().getDepartmentType()); - - - String s = "LETS-SH2024092900000029"; + + String s = "LETS-SH2024101700000270"; soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock"); } } \ No newline at end of file