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 4f754136..dbef9aa3 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 @@ -615,7 +615,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } //每50作为一个批次插入主表,根据主键(id)判断是否重复,如果重复的,则不进行插入 - List> ofssaleorderoutsearchList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList1, 800); + List> ofssaleorderoutsearchList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList1, 200); for (int i = 0; i < ofssaleorderoutsearchList.size(); i++) { List headerDtoList = ofssaleorderoutsearchList.get(i); Thread thread = new Thread(new Runnable() { @@ -643,7 +643,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } //插入明细表 - List> detailsDtoList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList2, 800); + List> detailsDtoList = SplitListByCountUtil.splitListByCount(headerDetailsDtoList2, 200); for (int i = 0; i < detailsDtoList.size(); i++) { List detailsDtos = detailsDtoList.get(i); Thread thread = new Thread(new Runnable() { @@ -2493,9 +2493,11 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { // detailsDto.setHeaderDetailsDto(headerDetailsDto1); // } // } - com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto1 = stringHeaderDetailsDtoMap.get(refOrderCode); - if (headerDetailsDto1 != null) { - detailsDto.setHeaderDetailsDto(headerDetailsDto1); + if (refOrderCode != null && !"".equals(refOrderCode)) { + com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto headerDetailsDto1 = stringHeaderDetailsDtoMap.get(refOrderCode); + if (headerDetailsDto1 != null) { + detailsDto.setHeaderDetailsDto(headerDetailsDto1); + } } } // String targetRefOrderCode = header.getRefOrderCode(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java index 16f5157b..e764f627 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderAfterSalesAmountAllocationUtil.java @@ -46,9 +46,9 @@ public class OfsOrderAfterSalesAmountAllocationUtil { logger.error("batchTocSalesAmountAllocation方法抛出异常,批量处理TOC售后订单分摊异常", e); } }); - logger.info("=记录优惠金额分摊结果开始="); - printAmountOfMoneyNum(rerturnGoodsOrderSearchDataList); - logger.info("=记录优惠金额分摊结果完成="); +// logger.info("=记录优惠金额分摊结果开始="); +// printAmountOfMoneyNum(rerturnGoodsOrderSearchDataList); +// logger.info("=记录优惠金额分摊结果完成="); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java index 59a3692f..3536675b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/OfsOrderSaleAmountAllocationUtil.java @@ -43,9 +43,9 @@ public class OfsOrderSaleAmountAllocationUtil { logger.error("batchTocSalesAmountAllocation方法抛出异常,批量处理TOC销售金额分摊异常", e); } }); - logger.info("=记录优惠金额分摊结果开始="); - printAmountOfMoneyNum(headerDetailsDtoList); - logger.info("=记录优惠金额分摊结果完成="); +// logger.info("=记录优惠金额分摊结果开始="); +// printAmountOfMoneyNum(headerDetailsDtoList); +// logger.info("=记录优惠金额分摊结果完成="); } /** 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 4acc1fa4..cfb34f91 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 @@ -79,8 +79,10 @@ public class SoSaleOutPluginInitializerToBTest { // soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101700000270"); try { - soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101800025544", "stock"); +// soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024101800025544", "stock"); // soSaleOutPluginInitializerToB.startImplementByTranTime("2024-10-18 14:49:58", "2024-10-18 14:49:59"); + String aaa = "LETS-SH2024101800024795"; + soSaleOutPluginInitializerToB.startImplementByCode(aaa, "stock"); } catch (Exception e) { e.printStackTrace(); }