From b66107bed6f1651a56fb4bb9a8ae91a744e6fa84 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Sat, 15 Feb 2025 15:50:12 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BA=8C=E6=9C=9F=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IPdmBiSlittingproductionplanService.java       | 7 +++++++
 .../impl/PdmBiSlittingproductionplanServiceImpl.java       | 7 +++++++
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
index 38c9950dd..31675575f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
@@ -129,4 +129,11 @@ public interface IPdmBiSlittingproductionplanService extends IService<PdmBiSlitt
      * @return /
      */
     List<PdmBiSlittingproductionplan> getByQzzNoByNoStatus(String qzzno);
+
+    /**
+     * 根据子卷号获取一条记录
+     * @param containerName
+     * @return
+     */
+    PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
index a2f1eff72..762b25f92 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
@@ -184,4 +184,11 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0");
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
+
+    @Override
+    public PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName) {
+        LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
+        lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName);
+        return getOne(lam, false);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 30f7cf502..79baa0730 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -1946,7 +1946,7 @@ public class SlitterServiceImpl implements SlitterService {
         // 虚拟计划
         for (int i = 0; i < 4; i++) {
             String containerName = area + "虚拟-" + deviceCode + "-" + i;
-            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerNameNotStatus(containerName);
             if (ObjectUtil.isEmpty(plan)) {
                 plan = new PdmBiSlittingproductionplan();
                 plan.setWorkorder_id(IdUtil.getSnowflake(1,1).nextIdStr());