aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 业务确认账单报错修复' (#255) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/255
This commit is contained in:
heyu 2025-12-03 17:57:09 +08:00
commit bd6251fa06
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -467,7 +467,10 @@ public class EmisSettleSubBillController extends EmisBaseController
bug:1688
调整为现金保留自动确认,月结调整为不自动确认
*/
EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo());
EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo());
if (waybill.getRealFee() == null) {
return AjaxResult.success("确认成功");
}
if(
!"2".equals(waybill.getPaymentType())
&& !"4".equals(waybill.getPaymentType())