From 69f327d2f7b64dfcbf1756a6343e38065b569565 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Sat, 28 Sep 2024 17:43:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E4=BB=93=E7=A7=9F=E6=88=90=E6=9C=AC=E8=AE=A1=E7=AE=97=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/statistics/job/ExpenseJob.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java
index a9773dea0..9cd65f688 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java
@@ -214,8 +214,10 @@ public class ExpenseJob {
 					entity.setDrWareDisArea(Convert.toStr(gcpArea));
 					if (ObjectUtil.isNotEmpty(acreage)
 						&& ObjectUtil.isNotEmpty(unitPrice)) {
-						BigDecimal temCost = NumberUtil.div(NumberUtil.mul(gcpArea, unitPrice), NumberUtil.mul(acreage, dayOfMonth), 6);
-						entity.setDrWareDisTotalCost(Convert.toStr(temCost));
+						if (!NumberUtil.equals(NumberUtil.mul(acreage, dayOfMonth), BigDecimal.ZERO)) {
+							BigDecimal temCost = NumberUtil.div(NumberUtil.mul(gcpArea, unitPrice), NumberUtil.mul(acreage, dayOfMonth), 6);
+							entity.setDrWareDisTotalCost(Convert.toStr(temCost));
+						}
 					}
 				}
 				if (CollUtil.isNotEmpty(qualityDeliverEntityMap)) {
@@ -223,15 +225,21 @@ public class ExpenseJob {
 						// 租用客户件数
 						entity.setRentedItemsDispatchedQuantity(qualityDeliverEntityMap.get(warehouseId).getRentedItemsDispatchedQuantity());
 						// 租用客户单件成本
-						entity.setCustomerRentedItemCostPerUnit(Convert.toStr(NumberUtil.div(entity.getCustomerTotalLeasingCost(), entity.getRentedItemsDispatchedQuantity(), 6)));
+						if (!StrUtil.equals(entity.getRentedItemsDispatchedQuantity(), "0")) {
+							entity.setCustomerRentedItemCostPerUnit(Convert.toStr(NumberUtil.div(entity.getCustomerTotalLeasingCost(), entity.getRentedItemsDispatchedQuantity(), 6)));
+						}
 						// 临时周转件数
 						entity.setTemporaryTurnoverQuantity(qualityDeliverEntityMap.get(warehouseId).getTemporaryTurnoverQuantity());
 						// 临时周转单件成本
-						entity.setTemporaryTurnoverCostPerItem(Convert.toStr(NumberUtil.div(entity.getTotalTemporaryTurnoverCost(), entity.getTemporaryTurnoverQuantity(), 6)));
+						if (!StrUtil.equals(entity.getTemporaryTurnoverQuantity(), "0")) {
+							entity.setTemporaryTurnoverCostPerItem(Convert.toStr(NumberUtil.div(entity.getTotalTemporaryTurnoverCost(), entity.getTemporaryTurnoverQuantity(), 6)));
+						}
 						// 干仓配件数
 						entity.setDrWareDisNumber(qualityDeliverEntityMap.get(warehouseId).getDrWareDisNumber());
 						// 干仓配件单件成本
-						entity.setDrWareDisCostPerUnit(Convert.toStr(NumberUtil.div(entity.getDrWareDisTotalCost(), entity.getDrWareDisNumber(), 6)));
+						if (!StrUtil.equals(entity.getDrWareDisNumber(), "0")) {
+							entity.setDrWareDisCostPerUnit(Convert.toStr(NumberUtil.div(entity.getDrWareDisTotalCost(), entity.getDrWareDisNumber(), 6)));
+						}
 						// 不为空的相加计算出总出库数
 						entity.setTotalQuantityIssued(Convert.toStr(NumberUtil.add(entity.getRentedItemsDispatchedQuantity(), entity.getTemporaryTurnoverQuantity(), entity.getDrWareDisNumber())));
 					}