From a19ae900e174922bdd37057e0acff742172e2c80 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 3 Apr 2025 09:42:26 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=B8=80=E6=A5=BC=E7=AE=A1=E5=88=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index d9ce36518..4e9eecd57 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -18,6 +18,8 @@ import org.nl.b_lms.pda.service.PrintTableTwoService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.info.service.IPdmBiContainerinfoService;
+import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
+import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
 import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.dao.mapper.BstIvtPackageinfoivtMapper;
 import org.nl.b_lms.sch.point.dto.BstIvtPackageinfoivtVO;
@@ -83,6 +85,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     private PrintTableTwoService printTableTwoService;
     @Autowired
     private IPdmBiSlittingproductionplanService iPdmBiSlittingproductionplanService;
+    @Autowired
+    private IpdmBiSubpackagerelationService subpackagerelationService;
 
 
 
@@ -1001,6 +1005,13 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 result.put("message", "质检结果只能为合格品或管制品！");
                 return result;
             }
+            if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("管制品"))) {
+                PdmBiSubpackagerelation one = subpackagerelationService.getOne(new QueryWrapper<PdmBiSubpackagerelation>()
+                        .eq("container_name", whereJson.getString("container_name")));
+                if (one!=null){
+                    throw new BadRequestException("包装关系存在,请先解绑包装关系");
+                }
+            }
             dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name")));
             if (ObjectUtils.isEmpty(dtoList)) {
                 throw new BadRequestException("子卷号或点位信息有误，请核对是否存在！");