|
|
@@ -423,11 +423,11 @@ public class KwTransportService {
|
|
|
vo.setDeficitAmount(String.valueOf(deficitAmount));
|
|
|
// 存在装卸货差时 计算扣亏量
|
|
|
BigDecimal lossAmount = BigDecimal.valueOf(0);
|
|
|
- if(deficitAmount.compareTo(BigDecimal.valueOf(0)) > 0) {
|
|
|
+ BigDecimal loss = waybillOrder.getLoss() == null ? BigDecimal.valueOf(0) : waybillOrder.getLoss();
|
|
|
+ if(deficitAmount.compareTo(BigDecimal.valueOf(0)) > 0 && loss.compareTo(BigDecimal.valueOf(0)) > 0) {
|
|
|
String lossUnit = waybillOrder.getLossUnit();
|
|
|
Map<String, SysDictResDto> LossUnitType = remoteSystemService.queryDictMapByType(DictTypeEnum.TAX_RATE_TYPE.getType());
|
|
|
SysDictResDto sysDictRes = LossUnitType.get(lossUnit);
|
|
|
- BigDecimal loss = waybillOrder.getLoss() == null ? BigDecimal.valueOf(0) : waybillOrder.getLoss();
|
|
|
|
|
|
if(sysDictRes.getLabel().equals("%")) {
|
|
|
// 百分比
|