|
@@ -4788,8 +4788,10 @@ public class KwtWaybillOrderV1Service {
|
|
|
resp.setLoadCompleteRate(calculatePercentage(loadAmount, entrustAmount));
|
|
resp.setLoadCompleteRate(calculatePercentage(loadAmount, entrustAmount));
|
|
|
String lossRate = calculateLossRate(loadAmount, unloadAmount);
|
|
String lossRate = calculateLossRate(loadAmount, unloadAmount);
|
|
|
resp.setLossRate(lossRate);
|
|
resp.setLossRate(lossRate);
|
|
|
-
|
|
|
|
|
- resp.setIsPassReason(isLossRateExceeded(logOrder, lossRate));
|
|
|
|
|
|
|
+ // 原矿运输订单计算是否超过货损率
|
|
|
|
|
+ if (Objects.equals(logOrder.getOrderType(), 1)) {
|
|
|
|
|
+ resp.setIsPassReason(isLossRateExceeded(logOrder, lossRate));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 轨迹记录
|
|
// 轨迹记录
|
|
|
if (!CollectionUtils.isEmpty(nodeList)) {
|
|
if (!CollectionUtils.isEmpty(nodeList)) {
|