Browse Source

销售利润导出修改

lazhaoqian 3 years ago
parent
commit
e41b9e0ef8

+ 10 - 1
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -436,6 +436,11 @@ public class ExportOrderController extends BladeController {
 					item.setPartsCost(list.stream().filter(e -> e.getPartsCost() != null).reduce(BigDecimal.ZERO,(x,y) ->{
 						return x.add(y.getPartsCost().multiply(y.getOrderQuantity()));
 					},BigDecimal::add));//配件成本金额和
+				}else {
+					item.setAmount(BigDecimal.ZERO);
+					item.setProcurementCost(BigDecimal.ZERO);
+					item.setPurchasePrice(BigDecimal.ZERO);
+					item.setPartsCost(BigDecimal.ZERO);
 				}
 				//获取应收费用
 				List<OrderFees> feesList = orderFeesService.list(new QueryWrapper<OrderFees>().eq("pid", item.getId()).eq("is_deleted", 0).eq("tenant_id", item.getTenantId()).eq("fees_type", 1));
@@ -458,7 +463,11 @@ public class ExportOrderController extends BladeController {
 				//产品利润 销售金额-采购成本金额-配件成本金额
 				item.setGrossProfit(item.getAmount().subtract(item.getProcurementCost()).subtract(item.getPartsCost()));
 				//产品利率
-				item.setGrossProfitRate(item.getGrossProfit().divide(item.getAmount(),2,BigDecimal.ROUND_HALF_UP));
+				if (item.getAmount().compareTo(BigDecimal.ZERO) >0){
+					item.setGrossProfitRate(item.getGrossProfit().divide(item.getAmount(),2,BigDecimal.ROUND_HALF_UP));
+				}else {
+					item.setGrossProfitRate(BigDecimal.ZERO);
+				}
 				//计算单票利润=单票利润+费用应收-费用应付
 				item.setSingleTicketMargin(item.getGrossProfit().add(item.getFd()).subtract(item.getFc()));
 			});