From 1fd76c3924138ca453b1335181fa065cd3ec4f4a Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Tue, 6 Aug 2024 08:56:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81MES=E8=B0=83=E7=94=A8LMS=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E5=85=B3=E7=B3=BB=E6=8A=A5=E9=94=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java   | 7 ++++++-
 .../ext/szls/service/impl/LmsToBigScreenServiceImpl.java   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index b2e28788e..964655186 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -1289,11 +1289,16 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 //查询库内是否存在相同的子卷号
                 JSONObject container_jo = WQLObject.getWQLObject("PDM_BI_SubPackageRelation").query("container_name = '" + ContainerName + "'").uniqueResult(0);
                 if (ObjectUtil.isNotEmpty(container_jo)) {
-                    if (container_jo.getString("need_delete").equals("99")) {
+                    if (StrUtil.isNotEmpty(container_jo.getString("need_delete")) && container_jo.getString("need_delete").equals("99")) {
                         WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation");
                         HashMap<String, String> map = new HashMap<>();
                         map.put("need_delete", "");
                         tab.update(map, "package_box_sn = '" + PackageBoxSN + "'");
+                        result.put("RTYPE", "S");
+                        result.put("RTMSG", "操作成功!");
+                        result.put("RTOAL", 1);
+                        result.put("RTDAT", null);
+                        return result;
                     } else {
                         throw new BadRequestException("LMS系统中已存在子卷号：" + ContainerName + "，请检查！");
                     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
index da45ed1e8..dd2fa72cb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java
@@ -32,7 +32,7 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService {
         JSONObject json = new JSONObject();
         for (URLEnum url : URLEnum.values()) {
             String product_area = url.getProduct_area();
-            if (product_area.equals("BLK") || product_area.equals("B2")) {
+            if (product_area.startsWith("B")) {
                 continue;
             }
             JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND product_area = '" + product_area + "'").getResultJSONArray(0);