|
|
|
@ -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()))); |
|
|
|
|
} |
|
|
|
|