From ccdcd79a48aabb15d9ce9525a3535c01e69475c8 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 31 十月 2025 11:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
index b4ded1c..c552c60 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -33,6 +33,8 @@
* 鏌ヨ涓嶅共娑夌殑鍙墽琛屼换鍔�
* */
WrkMastSta selectNoInterfere(@Param("staStarts") List<Integer> staStarts, @Param("staEnds") List<Integer> staEnds,@Param("workNo")Long workNo );
+ WrkMastSta selectNoInterfereCrn(@Param("staStarts") List<Integer> staStarts, @Param("staEnds") List<Integer> staEnds,@Param("workNo")Long workNo );
+
List<WrkMastSta> selectNoInterfereList(@Param("staStarts") List<Integer> staStarts, @Param("staEnds") List<Integer> staEnds);
WrkMastSta selectNoInterfereToCrn(@Param("staStarts") List<Integer> staStarts, @Param("staEnds") List<Integer> staEnds,@Param("workNo")Long workNo );
@@ -44,5 +46,6 @@
List<WrkMastSta> selectLockWrkT();
List<WrkMastSta> selectPakingWrk(@Param("staStart") Integer staStart);
+ List<WrkMastSta> selectPakingWrkNum(@Param("rgvNo") Integer rgvNo);
}
--
Gitblit v1.9.1