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, 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 findByFreeOrUsedStock(String areaName, String status); }