From a737f4afdc2c4bad021d458f88d2f51655cc7d6e Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Mon, 2 Dec 2024 17:11:28 +0800
Subject: [PATCH] no message

---
 .../youchain/basicdata/repository/StockRepository.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/basicdata/repository/StockRepository.java b/youchain-system/src/main/java/com/youchain/basicdata/repository/StockRepository.java
index 56bf5b7..51181b1 100644
--- a/youchain-system/src/main/java/com/youchain/basicdata/repository/StockRepository.java
+++ b/youchain-system/src/main/java/com/youchain/basicdata/repository/StockRepository.java
@@ -44,9 +44,10 @@ public interface StockRepository extends JpaRepository<Stock, Long>, JpaSpecific
     Stock findByPointCode(String pointCode);
 
     @Query(" from Stock s where s.point.area.name = :areaName " +
-            "and s.point.id > 0 " +
-            "and s.point.status = 'USED'" +
-            "and s.status = :status " +
-            "and s.enabled = true")
+            " and s.point.id > 0 " +
+            " and s.point.status = 'USED'" +
+            " and s.status = :status " +
+            " and s.enabled = true " +
+            " and s.code not in (select agv.stockCode from AgvTask agv where agv.status not in ('FINISH','CANCEL') ) ")
     List<Stock> findByFreeOrUsedStock(String areaName, String status);
 }