From 7c3a232e114da2674d4931b111cf169a95d30272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A4=E9=94=A6=E7=A7=91?= <32996823@qq.com>
Date: Fri, 20 Dec 2024 10:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AE=A2=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=BA=E7=A9=BA=E8=BF=94=E5=9B=9E=E7=A9=BA?=
 =?UTF-8?q?=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ktg/mes/md/controller/BaseKnifeController.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
index 6fb7fa7..455bbe6 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
@@ -833,7 +833,9 @@ public class BaseKnifeController extends BaseController {
         // 查询该物料编码的锁定记录
         BaseKnifeLocked baseKnifeLockedWrapper = new BaseKnifeLocked();
         baseKnifeLockedWrapper.setItemCode(mdItemCode);
+        baseKnifeLockedWrapper.setStatus(0);
         List<BaseKnifeLocked> baseKnifeLockedList = baseKnifeLockedMapper.selectBaseKnifeLockedList(baseKnifeLockedWrapper);
+        if (baseKnifeLockedList.isEmpty()) return new ArrayList<>();
 
         // 根据台账ID进行分组
         Map<Long, List<BaseKnifeLocked>> groupBaseKnifeLocked = new HashMap<>();