From 8356fc190f48730877eb5aee56cfe12da0f7ec36 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 11 Nov 2024 14:48:31 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisSettleSubBillController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 df3a20dd0..303db12eb 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 @@ -419,7 +419,7 @@ public class EmisSettleSubBillController extends EmisBaseController return AjaxResult.error("账单不存在:"+old.getBillCode()); } - if("0086".equals(old.getWaybillDetail().getReceiveCountry()) + if(!"0086".equals(oldSubBill.getWaybillDetail().getSendCountry()) && "0086".equals(old.getWaybillDetail().getReceiveCountry()) && ( "2".equals(old.getWaybillDetail().getPaymentType()) || "4".equals(old.getWaybillDetail().getPaymentType())