|
@@ -83,7 +83,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
|
|
// pageView.put("statusSet", statusSet);
|
|
// pageView.put("statusSet", statusSet);
|
|
|
|
|
|
|
|
|
|
- // 查询采购订单总数
|
|
|
|
|
|
+ // 查询汽运信息总数
|
|
Integer dataCount = baseMapper.getCountByCondition(pageView);
|
|
Integer dataCount = baseMapper.getCountByCondition(pageView);
|
|
List<TranSettlementReport> dataList = baseMapper.getListByCondition(pageView);
|
|
List<TranSettlementReport> dataList = baseMapper.getListByCondition(pageView);
|
|
|
|
|
|
@@ -101,10 +101,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
|
|
tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
|
|
tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //损耗
|
|
|
|
- if(tranSettlementReport1.getUnloadingWeight() != null){
|
|
|
|
- tranSettlementReport1.setLossWeight(tranSettlementReport1.getLoadingWeight() - tranSettlementReport1.getUnloadingWeight());
|
|
|
|
- }
|
|
|
|
//扣款
|
|
//扣款
|
|
if(tranSettlementReport1.getLossWeight() <= (tranSettlementReport1.getLoadingWeight()/1000)){
|
|
if(tranSettlementReport1.getLossWeight() <= (tranSettlementReport1.getLoadingWeight()/1000)){
|
|
tranSettlementReport1.setDeductionAmount("0");
|
|
tranSettlementReport1.setDeductionAmount("0");
|