From e568ae85498955de9b04d9e617197d4e06d13774 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:05:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=89=93=E5=8D=B0OFS=E5=8D=95=E5=8F=B7=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个类中添加 printOfsDocCode 方法，用于打印OFS单号 - 优化原有的 splicingPrintingOrderNumber 方法，提高代码可读性和可维护性 -统一错误日志格式，增加异常信息打印 --- .../plugin/outsourc/ConsignmachiningIn.java | 34 ++++++++++++ .../outsourc/ConsignmachiningInReturn.java | 33 ++++++++++++ .../plugin/purchase/ProxyPurchaseReturn.java | 33 ++++++++++++ .../purchase/ProxyPurchaseWarehousOrder.java | 34 ++++++++++++ .../ProxyPurchaseWarehousWarehouse.java | 34 ++++++++++++ .../sales/SoSaleOutPluginInitializerToB.java | 52 ++++++++++++++++--- .../SoSaleReturnPluginInitializerToB.java | 44 ++++++++++++++-- 7 files changed, 254 insertions(+), 10 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index cc74c9a2..723fc279 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.*; import java.util.function.Predicate; +import java.util.stream.Collectors; /** * O采购入库(委外加工类型)->U8C委外订单 @@ -225,6 +226,8 @@ public class ConsignmachiningIn extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() { @Override @@ -1067,4 +1070,35 @@ public class ConsignmachiningIn extends PluginBaseEntity { logger.error("记录splitDateAndPush方法抛出的异常", e); } } + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List returnGoodHeaderDetailsDataDtoArrayList, String startTime, String endTime) { + Assert.notNull(returnGoodHeaderDetailsDataDtoArrayList, "returnGoodHeaderDetailsDataDtoArrayList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = returnGoodHeaderDetailsDataDtoArrayList.stream().map(returnGoodHeaderDetailsDataDto -> returnGoodHeaderDetailsDataDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("插件:{}，打印拉取到的单据号出错", getPluginName(), e); + } + } } \ No newline at end of file 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 575ff30e..402204f5 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 @@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * O采退出库->(关联之前正向的委外订单)U8C红字委外入库单 @@ -227,6 +228,8 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search"); logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { getSet(returnGoodHeaderDetailsDataDtoArrayList); } else { @@ -1246,4 +1249,34 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { return bdInvbasdocEntity2.get(0); } + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List headerDetailsDtos, String startTime, String endTime) { + Assert.notNull(headerDetailsDtos, "headerDetailsDtos不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = headerDetailsDtos.stream().map(returnGoodHeaderDetailsDataDto -> returnGoodHeaderDetailsDataDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("插件:{}，打印拉取到的单据号出错", getPluginName(), e); + } + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index dc187d9a..d822c045 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -224,6 +224,8 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search"); logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() { @Override @@ -1047,4 +1049,35 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { logger.info("记录splitDateAndPush方法抛出的异常", e); } } + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List returnGoodHeaderDetailsDataDtoArrayList, String startTime, String endTime) { + Assert.notNull(returnGoodHeaderDetailsDataDtoArrayList, "returnGoodHeaderDetailsDataDtoArrayList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = returnGoodHeaderDetailsDataDtoArrayList.stream().map(returnGoodHeaderDetailsDataDto -> returnGoodHeaderDetailsDataDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("插件:{}，打印拉取到的单据号出错", getPluginName(), e); + } + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 41f76321..9395c89a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.*; import java.util.function.Predicate; +import java.util.stream.Collectors; /** * 代理品牌采购业务：（代理品牌采购）OFS采购订单生成U8C采购订单 @@ -223,6 +224,8 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsPoOrder(queryOfsSoSaleOutVo, allOfsPoOrderList, 1L); logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), allOfsPoOrderList.size(), startTime, endTime); + printOfsDocCode(allOfsPoOrderList, startTime, endTime); + if (allOfsPoOrderList.size() > 0) { allOfsPoOrderList.removeIf(new Predicate() { @Override @@ -974,4 +977,35 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { logger.info("记录splitDateAndPush方法抛出的异常", e); } } + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List allOfsPoOrderList, String startTime, String endTime) { + Assert.notNull(allOfsPoOrderList, "allOfsPoOrderList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = allOfsPoOrderList.stream().map(returnGoodHeaderDetailsDataDto -> returnGoodHeaderDetailsDataDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("插件:{}，打印拉取到的单据号出错", getPluginName(), e); + } + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index fe58e3cd..05a9feef 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.*; import java.util.function.Predicate; +import java.util.stream.Collectors; /** * 代理品牌采购业务：（代理品牌采购）OFS采购入库单生成U8C采购入库单(关联原采购订单) @@ -221,6 +222,8 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("插件：{} O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() { @Override @@ -1034,4 +1037,35 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { Assert.state(false, "无法匹配到U8C采购订单明细行！refOrderDetailId：{}", stockinB.getRefOrderDetailId()); return null; } + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List returnGoodHeaderDetailsDataDtoArrayList, String startTime, String endTime) { + Assert.notNull(returnGoodHeaderDetailsDataDtoArrayList, "returnGoodHeaderDetailsDataDtoArrayList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = returnGoodHeaderDetailsDataDtoArrayList.stream().map(returnGoodHeaderDetailsDataDto -> returnGoodHeaderDetailsDataDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("插件:{}，打印拉取到的单据号出错", getPluginName(), e); + } + } } \ No newline at end of file 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 9c8221b9..090497df 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 @@ -29,6 +29,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto; +import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; @@ -154,12 +155,10 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { } } else { if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) { - //TODO 临时程序,删除U8C历史数据 - //TODO 临时程序,删除U8C历史数据 - deleteU8cDataUtil.deleteTargetU8cData(); - + //临时程序,删除U8C历史数据 +// deleteU8cDataUtil.deleteTargetU8cData(); //实时执行，每1分钟调度一次 - StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime(); + StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange(); startImplementByStockTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); startImplementByTranTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); } @@ -284,7 +283,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { // queryOfsSoSaleOutVo.setCode("LETS-SH2024010200000004"); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("插件：{} (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime); - splicingPrintingOrderNumber(headerDetailsDtoList, "stock", startTime, endTime, null); +// splicingPrintingOrderNumber(headerDetailsDtoList, "stock", startTime, endTime, null); + printOfsDocCode(headerDetailsDtoList, startTime, endTime, "出库"); + if (headerDetailsDtoList.size() > 0) { headerDetailsDtoList.removeIf(new Predicate() { @Override @@ -342,7 +343,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setStoreCode(tobShop); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("插件：{} (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), headerDetailsDtoList.size(), startTime, endTime); - splicingPrintingOrderNumber(headerDetailsDtoList, "tran", startTime, endTime, null); +// splicingPrintingOrderNumber(headerDetailsDtoList, "tran", startTime, endTime, null); + printOfsDocCode(headerDetailsDtoList, startTime, endTime, "确认收入"); + if (headerDetailsDtoList.size() > 0) { headerDetailsDtoList.removeIf(new Predicate() { @Override @@ -2884,4 +2887,39 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { calculationFormulaStr.append(format); return amountOfMoney.stripTrailingZeros().toPlainString(); } + + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List headerDetailsDtoList, String startTime, String endTime, String type) { + Assert.notNull(headerDetailsDtoList, "headerDetailsDtoList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(type); + stringBuffer.append(" "); + + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = headerDetailsDtoList.stream().map(headerDetailsDto -> headerDetailsDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("{} 插件:{}，打印拉取到的单据号出错", type, getPluginName(), e); + } + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 58f50d29..58bab59b 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -132,7 +132,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { } else { if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) { //实时执行，每1分钟调度一次 - StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime(); + StartAndEndVo startAndEndVo = offsetTimeTime.getCurrentDateRange(); startImplementByStockTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); startImplementByTradeTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); } @@ -271,7 +271,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001"); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("插件：{} (库存)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); - splicingPrintingOrderNumber(returnGoodHeaderDetailsDataDtoArrayList, "stock", startTime, endTime, null); +// splicingPrintingOrderNumber(returnGoodHeaderDetailsDataDtoArrayList, "stock", startTime, endTime, null); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime, "入库"); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() { @Override @@ -331,7 +333,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { // queryOfsSoSaleOutVo.setCode("LETS-RE2024081900000001"); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("插件：{} (确认收入)O接口返回行数：{} 时间段：{} {}", getPluginName(), returnGoodHeaderDetailsDataDtoArrayList.size(), startTime, endTime); - splicingPrintingOrderNumber(returnGoodHeaderDetailsDataDtoArrayList, "tran", startTime, endTime, null); +// splicingPrintingOrderNumber(returnGoodHeaderDetailsDataDtoArrayList, "tran", startTime, endTime, null); + printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime, "确认收入"); + if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() { @Override @@ -2702,4 +2706,38 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { calculationFormulaStr.append(format); return amountOfMoney.stripTrailingZeros().toPlainString(); } + + /** + * 打印OFS单号 + * + * @author liuyang + */ + private void printOfsDocCode(List returnGoodHeaderDetailsDataDtoArrayList, String startTime, String endTime, String type) { + Assert.notNull(returnGoodHeaderDetailsDataDtoArrayList, "returnGoodHeaderDetailsDataDtoArrayList不能为空"); + Assert.notNull(startTime, "startTime不能为空"); + Assert.notNull(endTime, "endTime不能为空"); + + try { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(type); + stringBuffer.append(" "); + + stringBuffer.append("插件："); + stringBuffer.append(getPluginName()); + stringBuffer.append(" "); + + stringBuffer.append("开始时间："); + stringBuffer.append(startTime); + stringBuffer.append("结束时间："); + stringBuffer.append(endTime); + stringBuffer.append(" "); + + stringBuffer.append("获取到的单号："); + String codes = returnGoodHeaderDetailsDataDtoArrayList.stream().map(headerDetailsDto -> headerDetailsDto.getHeader().getCode()).collect(Collectors.joining(",")); + stringBuffer.append(codes); + logger.info(stringBuffer.toString()); + } catch (Exception e) { + logger.error("{} 插件:{}，打印拉取到的单据号出错", type, getPluginName(), e); + } + } } \ No newline at end of file