From 848994667cd647002c352482c411c4570ccbbf7e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 25 九月 2025 17:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 2 ++
1 files changed, 2 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 99650a2..32fcad3 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -27,12 +27,14 @@
* 鏌ヨ鎸囧畾宸ヤ綔鍙蜂换鍔�
* */
WrkMastSta selectByWrkNo(@Param("workNo") Integer workNo);
+ WrkMastSta selectByWrkNoPut(@Param("workNo") Integer workNo);
/*
* 鏌ヨ涓嶅共娑夌殑鍙墽琛屼换鍔�
* */
WrkMastSta selectNoInterfere(@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 );
List<WrkMastSta> selectByWorkStaList(@Param("workSta") Integer workSta, @Param("rgvNo") Short rgvNo);
--
Gitblit v1.9.1