|
|
@ -139,35 +139,24 @@ public class BusinessOrderController {
|
|
|
|
//计算销售订单的利润
|
|
|
|
//计算销售订单的利润
|
|
|
|
for (BusinessOrderEntity entity : list) {
|
|
|
|
for (BusinessOrderEntity entity : list) {
|
|
|
|
//计算销售订单的总额
|
|
|
|
//计算销售订单的总额
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> queryWrapperSaleProduct = new QueryWrapper<>();
|
|
|
|
BigDecimal saleAmount = businessOrderService.getSaleAmountSumInfo(entity.getId()); //销售订单总额
|
|
|
|
queryWrapperSaleProduct.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,entity.getId());
|
|
|
|
BigDecimal purchaseAmount = voucherService.queryVoucherByBusinessOrderInfo(entity.getId()); //采购订单总额
|
|
|
|
List<BusinessOrderProductRelationalEntity> businessOrderProductList = businessOrderProductRelationalService.list(queryWrapperSaleProduct);
|
|
|
|
// List<VoucherEntity> voucherEntityList = voucherService.queryVoucherByBusinessOrderInfo(entity.getId()); //销售订单下所有销售发货凭证
|
|
|
|
BigDecimal saleAmount = new BigDecimal(0); //销售订单总额
|
|
|
|
// for (VoucherEntity entity1 : voucherEntityList){
|
|
|
|
BigDecimal purchaseAmount = new BigDecimal(0); //采购订单总额
|
|
|
|
// VoucherEntity voucherEntity = voucherService.queryVoucherDetailInfo(entity1.getVoucherRelation()); //销售发货凭证对应的采购收货凭证
|
|
|
|
for (BusinessOrderProductRelationalEntity productEntity : businessOrderProductList){
|
|
|
|
// if (ObjectUtil.isNotEmpty(voucherEntity)){
|
|
|
|
saleAmount = saleAmount.add(new BigDecimal(productEntity.getTaxCount()));
|
|
|
|
// BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(voucherEntity.getBusinessOrderId()); //采购收货凭证对应的采购单
|
|
|
|
}
|
|
|
|
// if (ObjectUtil.isNotEmpty(businessOrderEntity)){
|
|
|
|
QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
// QueryWrapper<BusinessOrderProductRelationalEntity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(VoucherEntity::getIsTransfer,"2");
|
|
|
|
// queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
queryWrapper.lambda().eq(VoucherEntity::getBusinessOrderId,entity.getId());
|
|
|
|
// queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getProductId,voucherEntity.getProductId());
|
|
|
|
queryWrapper.lambda().isNull(VoucherEntity::getDeleteMark);
|
|
|
|
// BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity = businessOrderProductRelationalService.getOne(queryWrapper2); //通过凭证商品id和采购单id找出采购单下具体的商品信息
|
|
|
|
List<VoucherEntity> voucherEntityList = voucherService.list(queryWrapper); //销售订单下所有销售发货凭证
|
|
|
|
// if (ObjectUtil.isNotEmpty(businessOrderProductRelationalEntity)){
|
|
|
|
for (VoucherEntity entity1 : voucherEntityList){
|
|
|
|
// purchaseAmount = purchaseAmount.add(businessOrderProductRelationalEntity.getBusinessPrice().multiply(entity1.getNetWeight()).setScale(2, RoundingMode.HALF_UP)); //采购单价*凭证净重 = 采购金额
|
|
|
|
VoucherEntity saleVoucher = voucherService.queryVoucherDetailInfo(entity1.getId()); //得到销售发货凭证的净重
|
|
|
|
// }
|
|
|
|
VoucherEntity voucherEntity = voucherService.queryVoucherDetailInfo(entity1.getVoucherRelation()); //销售发货凭证对应的采购收货凭证
|
|
|
|
// }
|
|
|
|
if (ObjectUtil.isNotEmpty(voucherEntity)){
|
|
|
|
// }
|
|
|
|
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(voucherEntity.getBusinessOrderId()); //采购收货凭证对应的采购单
|
|
|
|
// }
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
|
|
|
|
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
|
|
|
|
queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
|
|
|
|
queryWrapper2.lambda().eq(BusinessOrderProductRelationalEntity::getProductId,voucherEntity.getProductId());
|
|
|
|
|
|
|
|
BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity = businessOrderProductRelationalService.getOne(queryWrapper2); //通过凭证商品id和采购单id找出采购单下具体的商品信息
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderProductRelationalEntity)){
|
|
|
|
|
|
|
|
purchaseAmount = purchaseAmount.add(businessOrderProductRelationalEntity.getBusinessPrice().multiply(saleVoucher.getNetWeight()).setScale(2, RoundingMode.HALF_UP)); //采购单价*凭证净重 = 采购金额
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
|
|
|
|
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
|
|
|
|
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
|
|
|
|
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
|
|
|
|
businessOrderMap.put("id", businessOrderMap.get("id"));
|
|
|
|
businessOrderMap.put("id", businessOrderMap.get("id"));
|
|
|
|