From 3250f6b570e226a32784bc4840ec804760b3bd8e Mon Sep 17 00:00:00 2001 From: dengjun Date: Wed, 27 Dec 2023 14:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=94=9F=E6=88=90=E8=A3=85=E8=88=B9?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtosc/handler/ExportInHandler.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java index 4fdf4c9..6338e3e 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java @@ -1827,6 +1827,20 @@ public class ExportInHandler implements BaseHandler { return; } + // 已生成装船计划，不能导入 + List havePlans = openApi.haveShipPlan(exportIn.getVoyageId()); + if (exportIn != null && CollectionUtils.isNotEmpty(havePlans)) { + Boolean c = havePlans.contains(exportIn.getId()); + if (c) { + errorDataList.addAll(item.getValue().stream().map(p -> { + JSONObject o = JSONObject.from(p); + o.put("status", "已生成装船计划，不能导入"); + return o; + }).collect(Collectors.toList())); + return; + } + } + if (exportIn.getCheckStatus() == AuditEnum.AUDIT_PASS) { // 审核 errorDataList.addAll(item.getValue().stream().map(p -> { JSONObject o = JSONObject.from(p);