From 7a8c1f77a3004564ea93ac2de9b5df135680c920 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 25 Jun 2025 17:38:30 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=87=8D=E6=9E=84=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=99=E6=B8=AF-=E7=BC=85=E7=94=B8?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=80=BB=E8=BE=91=E3=80=82=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index c8fe54284..d99439c56 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -4929,9 +4929,13 @@ public class EmisBaseService { if (emisWaybillSave.getMasterBillCode().equals(emisWaybillSave.getBillCode())) { throw new EmisBizError(EmisBizErrorType.FAIL, "运单号主单号不能相同"); } - if (!"078".equals(emisWaybillSave.getTransLineType()) && !"002".equals(emisWaybillSave.getTransLineType()) && !"012".equals(emisWaybillSave.getTransLineType()) - && !"014".equals(emisWaybillSave.getTransLineType())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为缅甸快递/缅甸快递进口/柬埔寨快递进口"); + Set allowedTypes = new HashSet<>(); + allowedTypes.add("078"); + allowedTypes.add("002"); + allowedTypes.add("012"); + allowedTypes.add("014"); + if (!allowedTypes.contains(emisWaybillSave.getTransLineType())) { + throw new EmisBizError(EmisBizErrorType.FAIL, "虚拟单只支持线路为香港-缅甸快递/缅甸快递/缅甸快递进口/柬埔寨快递进口"); } EmisWaybill masterWaybill = emisWaybillMapper .selectMasterWaybillByBillCode(emisWaybillSave.getMasterBillCode());