From b32683cd825c8145c2f48c6922aab51a347bf1df Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sun, 13 Apr 2025 13:14:48 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB=E6=97=B6=E6=9C=AA=E6=89=BE?=
 =?UTF-8?q?=E5=88=B0=E6=9C=A8=E7=AE=B1=E8=B4=A7=E4=BD=8D=E5=B0=B1=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 7cdb4c1e8..73020d47b 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
@@ -789,11 +789,13 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             String packageBoxSn = containerName.getPackage_box_sn();
             WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
             JSONObject attr = attrTab.query("storagevehicle_code = '" + packageBoxSn + "'").uniqueResult(0);
-            attr.put("lock_type","1");
-            attrTab.update(attr);
-            result.put("message", code+"子卷包装解除成功,同时确认MES装箱以解绑定");
+            if (StringUtils.isNotEmpty(attr)){
+                attr.put("lock_type","1");
+                attrTab.update(attr);
+            }
         }
         this.removeById(containerName.getWorkorder_id());
+        result.put("message", code+"子卷包装解除成功,同时确认MES装箱以解绑定");
         return result;
     }