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

md

Browse Source
This commit is contained in:
linfso 2025-01-06 16:35:10 +08:00
parent 45d79de64c
commit 8836fe091a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,12 +523,17 @@ public class EmisSettleSubBillController extends EmisBaseController
return AjaxResult.error("账单不存在!"); return AjaxResult.error("账单不存在!");
} }
// 支付方式必须为其他才可以确认不出账
EmisWaybill emisWaybill=emisBaseService.getWaybillByBillCode(oldSubBill.getBillCode());
if(!"6".equals(emisWaybill.getPaymentType())){
return AjaxResult.error("非【其它】支付方式，不可操作!");
}
if("1".equals(oldSubBill.getBlConfirmCenter())){ if("1".equals(oldSubBill.getBlConfirmCenter())){
return AjaxResult.error("财务已确认!"); return AjaxResult.error("财务已确认!");
} }
// 目的地是中国时需要 4天后才可以确认 // 目的地是中国时需要 4天后才可以确认
if(!"0086".equals(oldSubBill.getWaybillDetail().getSendCountry()) && "0086".equals(oldSubBill.getWaybillDetail().getReceiveCountry()) if(!"0086".equals(oldSubBill.getWaybillDetail().getSendCountry()) && "0086".equals(oldSubBill.getWaybillDetail().getReceiveCountry())
&& ( && (
"2".equals(oldSubBill.getWaybillDetail().getPaymentType()) "2".equals(oldSubBill.getWaybillDetail().getPaymentType())