|
|
@@ -38,6 +38,7 @@ import org.springframework.data.mongodb.core.query.Query;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
@@ -152,7 +153,8 @@ public class WaybillManagementService {
|
|
|
waybillTicketVO.setUnloadTime(DateUtil.getDateTime(info.getUnloadTime()));
|
|
|
waybillTicketVO.setUnloadWeight(String.valueOf(info.getUnloadAmount()));
|
|
|
waybillTicketVO.setUnloadUrl(String.valueOf(info.getUnloadUrls()));
|
|
|
- waybillTicketVO.setDeficitAmount(String.valueOf(info.getDeficitAmount()));BigDecimal deficitLoss = info.getLoss() == null ? BigDecimal.valueOf(0) : info.getLoss();
|
|
|
+ waybillTicketVO.setDeficitAmount(String.valueOf(info.getDeficitAmount()));
|
|
|
+ BigDecimal deficitLoss = info.getLoss() == null ? BigDecimal.valueOf(0) : info.getLoss();
|
|
|
BigDecimal deficitAmount = info.getDeficitAmount() == null ? BigDecimal.valueOf(0) : info.getDeficitAmount();
|
|
|
BigDecimal deficitRealAmount = BigDecimal.valueOf(0);
|
|
|
if(deficitAmount.compareTo(BigDecimal.valueOf(0)) > 0) {
|