|
@@ -76,6 +76,8 @@ public class PurOrderProductServiceImpl extends ServiceImpl<PurOrderProductMappe
|
|
|
if (productList.size() == 0){
|
|
|
return productList;
|
|
|
}
|
|
|
+ return productList;
|
|
|
+
|
|
|
List<PurOrderProduct> refOrderList = productList.stream().filter(e-> oConvertUtils.getString(e.getSourceType()).indexOf("Con")==0).collect(Collectors.toList());
|
|
|
List<PurOrderProduct> refQuotationList = productList.stream().filter(e-> oConvertUtils.getString(e.getSourceType()).indexOf("Quo")==0).collect(Collectors.toList());
|
|
|
List<PurOrderProduct> unRefList = productList.stream().filter(e-> oConvertUtils.isEmpty(e.getSourceType())).collect(Collectors.toList());
|
|
@@ -84,7 +86,7 @@ public class PurOrderProductServiceImpl extends ServiceImpl<PurOrderProductMappe
|
|
|
unRef.setDiscountText("");
|
|
|
unRef.setTaxPriceOriginal(unRef.getTaxPrice());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
LambdaQueryWrapper<SaleOrderProduct> saleOrderProductQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
saleOrderProductQueryWrapper.in(SaleOrderProduct::getId, refOrderList.stream().map(PurOrderProduct::getSourceId).collect(Collectors.toList()));
|
|
@@ -135,7 +137,7 @@ public class PurOrderProductServiceImpl extends ServiceImpl<PurOrderProductMappe
|
|
|
}
|
|
|
});
|
|
|
|
|
|
-
|
|
|
+
|
|
|
LambdaQueryWrapper<PurQuotationSelectionProduct> purQuotationSelectionProductLambdaQueryWrapper2 = new LambdaQueryWrapper<>();
|
|
|
purQuotationSelectionProductLambdaQueryWrapper2.in(PurQuotationSelectionProduct::getId, refQuotationList.stream().map(PurOrderProduct::getSourceId).collect(Collectors.toList()));
|
|
|
List<PurQuotationSelectionProduct> purQuotationSelectionProductList2 = purQuotationSelectionProductMapper.selectList(purQuotationSelectionProductLambdaQueryWrapper2);
|
|
@@ -148,7 +150,7 @@ public class PurOrderProductServiceImpl extends ServiceImpl<PurOrderProductMappe
|
|
|
po.setDiscountText(discountText);
|
|
|
}
|
|
|
});
|
|
|
- return productList;
|
|
|
+ return productList;*/
|
|
|
}
|
|
|
|
|
|
}
|