|
@@ -190,9 +190,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
|
//扣款
|
|
|
if(tranSettlementReport.getLossWeight() <= (tranCarInfo.getLoadNetWeight()/1000)){
|
|
|
tranSettlementReport.setDeductionAmount("0");
|
|
|
+ //应付=单价x结算重量-扣款
|
|
|
+ tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice()*tranSettlementReport.getSettlementWeight());
|
|
|
}
|
|
|
else{
|
|
|
tranSettlementReport.setDeductionAmount(String.format("%.2f",(Float.valueOf(tranCarInfo.getLoadNetWeight()-tranCarInfo.getUnloadNetWeight()) - (tranCarInfo.getLoadNetWeight()/1000)) * Float.valueOf(tranCarInfo.getTranPrice())));
|
|
|
+ //应付=单价x结算重量-扣款
|
|
|
+ tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice()*tranSettlementReport.getSettlementWeight()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
|
|
|
}
|
|
|
tranSettlementReportService.updateById(tranSettlementReport);
|
|
|
}
|
|
@@ -226,6 +230,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
|
}
|
|
|
}
|
|
|
tranSettlementReport.setSettlementWeight(tranCarInfo.getLoadNetWeight());
|
|
|
+ //应付
|
|
|
+ tranSettlementReport.setAmountIngPayable(tranProcessInfo.getTranPrice()*tranSettlementReport.getSettlementWeight());
|
|
|
tranSettlementReport.setTranCarNo(tranCarInfo.getTranCarNo());
|
|
|
tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
|
|
|
tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
|