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 fc221a30..ca560583 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 @@ -1369,6 +1369,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { //查询OFS售后入库单对应的售后订单 List rerturnGoodsOrderSearchData = queryBatchAfterSalesOrder(returnGoodHeaderDetailsDataDtoList1); findAfterSalesOrder(rerturnGoodsOrderSearchData, returnGoodHeaderDetailsDataDtoList1); + returnGoodHeaderDetailsDataDtoList1 = filterForSale(returnGoodHeaderDetailsDataDtoList1); //测试 // RerturnGoodsOrderSearchData rerturnGoodsOrderSearchData2 = rerturnGoodsOrderSearchData.get(0); // List details2 = rerturnGoodsOrderSearchData2.getDetails(); @@ -3231,4 +3232,31 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } return map; } + + /** + * 如果售后入库单对应的售后订单状态为售中节点,则过滤掉不传递 + * + * @author liuyang + */ + public List filterForSale(List returnGoodHeaderDetailsDataDtoList1) { + List filteredList = null; + if (returnGoodHeaderDetailsDataDtoList1 != null && returnGoodHeaderDetailsDataDtoList1.size() > 0) { + filteredList = returnGoodHeaderDetailsDataDtoList1.stream().filter(stockinOrder -> { + StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); + if (header == null) { + // 如果 StockinH 为空,保留该对象 + return true; + } + // 获取 RerturnGoodsOrderSearchData 对象 + RerturnGoodsOrderSearchData returnData = header.getRerturnGoodsOrderSearchData(); + if (returnData == null) { + // 如果 RerturnGoodsOrderSearchData 为空,保留该对象 + return true; + } + // 检查 returnNode 是否不等于 200,若不等于则保留 + return !"200".equals(returnData.getHeader().getReturnNode().trim()); + }).collect(Collectors.toList()); + } + return filteredList; + } } \ No newline at end of file