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