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 | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
index 743cefb..c552c60 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -27,14 +27,25 @@
* 鏌ヨ鎸囧畾宸ヤ綔鍙蜂换鍔�
* */
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 );
+ 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 );
- WrkMastSta selectByWorkSta(@Param("workSta") Integer workSta, @Param("rgv_no") Integer rgv_no);
+ List<WrkMastSta> selectByWorkStaList(@Param("workSta") Integer workSta, @Param("rgvNo") Short rgvNo);
+ WrkMastSta selectByWorkSta(@Param("workSta") Integer workSta, @Param("rgvNo") Integer rgvNo);
+
+ List<WrkMastSta> selectLockWrk();
+ List<WrkMastSta> selectLockWrkT();
+ List<WrkMastSta> selectPakingWrk(@Param("staStart") Integer staStart);
+
+ List<WrkMastSta> selectPakingWrkNum(@Param("rgvNo") Integer rgvNo);
}
--
Gitblit v1.9.1