diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java index 4404abce..a56f9b10 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java @@ -137,7 +137,7 @@ public class OverallConstant { prodOverAll.put("u8c自定义项档案-单据红字标识-N名称", "N"); //中台地址 - devOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"); + prodOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"); // prodOverAll.put("u8c_url", "http://ufidahz.com.cn:9067/kangarooDataCenterV3/entranceController/externalCallInterface"); } 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 b6d4dbce..00916e79 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 @@ -996,8 +996,8 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { } // com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDto header1 = saleOrderMessageDto.getData().get(0).getHeader(); String memberId = header2.getMemberId(); - //TODO 测试 - memberId = "9387"; + // 测试 +// memberId = "9387"; Assert.notNull(memberId, "TOB销售订单(OFS)表头会员id不能为空,否则无法匹配U8C客商档案!"); Assert.state(!"".equals(memberId.trim()), "TOB销售订单(OFS)表头会员id不能为空,否则无法匹配U8C客商档案!"); @@ -1010,8 +1010,8 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { Assert.notNull(bdRdclEntity, "根据收发类别编码:{} 无法匹配到U8C收发类别"); // 销售公司、发货公司 - //TODO 测试 - header.setCompanyCode("SHLZ"); + // 测试 +// header.setCompanyCode("SHLZ"); String companyCode = header.getCompanyCode(); Assert.notNull(companyCode, "O表头公司不能为空"); BdCorpEntity bdCorpEntity = new BdCorpEntity(); @@ -1493,8 +1493,8 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { } com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDto header1 = saleOrderMessageDto.getData().get(0).getHeader(); String memberId = header1.getMemberId(); - // TODO 测试 - memberId = "9387"; + // 测试 +// memberId = "9387"; Assert.notNull(memberId, "TOB销售订单(OFS)表头会员id不能为空,否则无法匹配U8C客商档案!"); Assert.state(!"".equals(memberId.trim()), "TOB销售订单(OFS)表头会员id不能为空,否则无法匹配U8C客商档案!"); 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 3a923116..8186d457 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 @@ -1120,7 +1120,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // storeCode = "dy-off-01"; Assert.notNull(storeCode, "O店铺编码不能为空,没有办法完成业务逻辑!"); Assert.state(!"".equals(storeCode.trim()), "O店铺编码不能为空,没有办法完成业务逻辑!"); - BdCubasdocEntity bdCubasdocEntity = cacheTocMapVo.getStringBdCubasdocEntityMap().get(storeCode); + BdCubasdocEntity bdCubasdocEntity = cacheTocMapVo.getStringBdCubasdocEntityMap().get(storeCode.trim()); Assert.notNull(bdCubasdocEntity, "根据U8C客商基本档案def1(记录o店铺编码),无法匹配到客户档案 o店铺编码:{}", storeCode); //客商管理档案:2024年8月5日 15:41:54 TOC店铺名称查询U8C客商档案,已经和妮姐确认 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java index c8011a01..119a3670 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java @@ -245,7 +245,7 @@ public class TocOrderBasicArchivesCacheUtil { List> lists = SplitListByCountUtil.splitListByCount(stringList, 900); for (int i = 0; i < lists.size(); i++) { List strings = lists.get(i); - String result = strings.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")); + String result = strings.stream().map(s -> "'" + s.trim() + "'").collect(Collectors.joining(",")); if (result != null && result.length() > 0) { BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); bdCubasdocEntity.setDataSourceCode("lets_u8c"); @@ -323,7 +323,7 @@ public class TocOrderBasicArchivesCacheUtil { List> lists = SplitListByCountUtil.splitListByCount(stringList, 900); for (int i = 0; i < lists.size(); i++) { List strings = lists.get(i); - String result = strings.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")); + String result = strings.stream().map(s -> "'" + s.trim() + "'").collect(Collectors.joining(",")); if (result != null && result.length() > 0) { BdCumandocEntity bdCumandocEntity = new BdCumandocEntity(); bdCumandocEntity.setDataSourceCode("lets_u8c"); @@ -374,7 +374,7 @@ public class TocOrderBasicArchivesCacheUtil { List> lists = SplitListByCountUtil.splitListByCount(stringList, 900); for (int i = 0; i < lists.size(); i++) { List strings = lists.get(i); - String result = strings.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")); + String result = strings.stream().map(s -> "'" + s.trim() + "'").collect(Collectors.joining(",")); if (result != null && result.length() > 0) { BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity(); bdInvmandocEntity.setInvcodes(result); @@ -445,7 +445,7 @@ public class TocOrderBasicArchivesCacheUtil { List> lists = SplitListByCountUtil.splitListByCount(stringList, 900); for (int i = 0; i < lists.size(); i++) { List strings = lists.get(i); - String codesStr = strings.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")); + String codesStr = strings.stream().map(s -> "'" + s.trim() + "'").collect(Collectors.joining(",")); if (codesStr != null && codesStr.length() > 0) { BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity(); bdInvbasdocEntity.setInvcodes(codesStr); @@ -511,7 +511,7 @@ public class TocOrderBasicArchivesCacheUtil { List> lists = SplitListByCountUtil.splitListByCount(stringList, 900); for (int i = 0; i < lists.size(); i++) { List strings = lists.get(i); - String result = strings.stream().map(s -> "'" + s + "'").collect(Collectors.joining(",")); + String result = strings.stream().map(s -> "'" + s.trim() + "'").collect(Collectors.joining(",")); if (result != null && result.length() > 0) { BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity(); bdTaxitemsEntity.setInvcodes(result); 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 9d014812..b8cb8680 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 @@ -102,5 +102,7 @@ class SoSaleOutPluginInitializerToCTest { } catch (Exception e) { e.printStackTrace(); } + +// soSaleOutPluginInitializerToC.sendU8CTOCOrder("123446"); } } \ No newline at end of file