|
|
@@ -451,12 +451,17 @@ public class GatekeeperOrderService {
|
|
|
* 计算货损率
|
|
|
*/
|
|
|
private static BigDecimal calculateLossRate(BigDecimal loadAmount, BigDecimal unloadAmount) {
|
|
|
+ log.info("[门卫]开始计算货损率,装货净重:{},卸货净重:{}", JSON.toJSONString(loadAmount), JSON.toJSONString(loadAmount));
|
|
|
+ BigDecimal lossRate = BigDecimal.ZERO;
|
|
|
if (loadAmount != null && unloadAmount != null && loadAmount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- return loadAmount.subtract(unloadAmount)
|
|
|
+ lossRate = loadAmount.subtract(unloadAmount)
|
|
|
.divide(loadAmount, 4, RoundingMode.HALF_UP)
|
|
|
.setScale(2, RoundingMode.HALF_UP);
|
|
|
+ return lossRate;
|
|
|
}
|
|
|
- return BigDecimal.ZERO;
|
|
|
+ log.info("[门卫]计算货损率完成,货损率:{}", JSON.toJSONString(lossRate));
|
|
|
+ return lossRate;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|