From 115ef819b51cd81b175f2fd8bf15236ca9147227 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 23 Dec 2024 20:03:03 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=B8=80=E6=A5=BC=E5=86=85=E5=8C=85?=
 =?UTF-8?q?=E9=97=B4=E6=B7=BB=E5=8A=A0mes2=E9=93=BE=E6=8E=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java   | 7 ++++++-
 .../nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java   | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index e37c1a777..399594ea5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -45,6 +45,8 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
@@ -364,7 +366,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         //给MES传输子卷包装关系
         CompletableFuture.runAsync(() -> {
             try {
-                transferBoxPackageToMes(false, whereJson, containerNameList, boxSn, weightTotal);
+                String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue();
+                if ("1".equals(isConnect2)) {
+                    transferBoxPackageToMes(false, whereJson, containerNameList, boxSn, weightTotal);
+                }
             } catch (Exception e) {
                 log.error("子卷装箱异常，transferBoxPackageToMes给MES传输子卷包装关系异常,木箱号为：" + boxSn + ",异常信息：" + e);
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
index 2a40d609c..f4a89cc4c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
@@ -971,6 +971,10 @@ public class LmsToMesServiceImpl implements LmsToMesService {
 
         JSONObject result = new JSONObject();
 
+        String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue();
+        if ("0".equals(isConnect2)) {
+            return result;
+        }
         String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
         String api = "CamstarApi/GetInspectionResult";
         url = url + api;