|
@@ -335,6 +335,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
|
|
|
p.setProductUnit(vo.getUnit());
|
|
|
p.setProductSpec(vo.getSpec());
|
|
|
p.setProductCustomCode(vo.getCustomCode());
|
|
|
+ p.setProductDefinition(vo.getDefinition());
|
|
|
//赋值次品数量
|
|
|
List<Stock> stockList = stockMap.get(p.getBussinessId());
|
|
|
if (ObjectUtils.isNotEmpty(stockList)) {
|
|
@@ -347,6 +348,20 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
|
|
|
}
|
|
|
p.setDefectiveQuantity(defectiveQuantity);
|
|
|
}
|
|
|
+ //赋值申购数量
|
|
|
+ SubscribeDetail subscribeDetail1 = subscribeDetailService.getById(p.getSubscribeDetailId());
|
|
|
+ if (ObjectUtils.isNotEmpty(subscribeDetail1)) {
|
|
|
+ p.setSubscribeQuantity(subscribeDetail1.getCount());
|
|
|
+ }
|
|
|
+ //赋值已采购数量
|
|
|
+ List<PurchaseDetail> list = purchaseDetailService.list(q -> q.eq(PurchaseDetail::getSubscribeDetailId, p.getSubscribeDetailId()));
|
|
|
+ if (ObjectUtils.isNotEmpty(list)) {
|
|
|
+ BigDecimal count = list.stream()
|
|
|
+ .map(PurchaseDetail::getCount)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ p.setPurchaseQuantity(count);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|