Merge pull request 'demand: TMS-客户账单管理--业务销账申请、财务中心销账审核、修改销账申请-异常提示优化与用户交互体验' (#214) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/214
This commit is contained in:
commit
8604dc012f
@ -189,7 +189,7 @@ public class EmisWriteoffApplyController extends EmisBaseController {
|
||||
return toAjax(emisWriteoffApplyService.insertEmisWriteoffApply(emisWriteoffApply));
|
||||
} catch (Exception e) {
|
||||
log.error("新增销账申请失败", e);
|
||||
return error("新增销账申请失败:" + e.getMessage());
|
||||
return error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -157,7 +157,7 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
|
||||
BigDecimal totalAmount = detail.getApplyMoney().add(receivedAmount);
|
||||
if (totalAmount.compareTo(recMoney) > 0) {
|
||||
throw new EmisBizError("运单号 " + detail.getBillCode() + " 的申请金额(" + detail.getApplyMoney()
|
||||
+ ") + 已收金额(" + receivedAmount + ") = " + totalAmount + " 超过账单应收金额("
|
||||
+ ") + 已收金额(" + receivedAmount + ") = " + totalAmount + " 超过运单应收金额("
|
||||
+ recMoney + ")");
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user