From 0178479f89e497f68fdc41de6b6b0909eb213b6a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 14:25:04 +0800
Subject: [PATCH] tomcat部署发现问题，所以加了这个配置
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index cddf0f1..328b9da 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -14,24 +12,61 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
-// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
- List<WrkMast> selectToBeCompleteData();
-
- List<WrkMast> selectToBeHistoryData();
-
// wcs ---------------------------------------------
- @Select("select top 1 wrk_no,loc_no,source_sta_no,sta_no,crn_no,wrk_sts,io_type from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
- WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+ // 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
+// @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
+ WrkMast selectPakInStep1(@Param("sourceStaNo") Integer sourceStaNo, @Param("barcode") String barcode);
- @Select("select top 1 loc_no,source_sta_no,sta_no,wrk_no,crn_no,wrk_sts,io_type,source_loc_no,io_time from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
- WrkMast selectPickStep(@Param("workNo")Integer workNo);
+ WrkMast selectPakInStep11(@Param("sourceStaNo") Integer sourceStaNo);
- // work log -------------------------------------------------------
- @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
- int saveWrkMastLog(Integer workNo);
+ List<WrkMast> selectInStep4();
- @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
- int saveWrkDetlLog(Integer workNo);
+ WrkMast selectByWorkNo(Integer workNo);
+
+ WrkMast selectByMainWrkNo(Integer workNo);
+
+ WrkMast selectByShuttleNo(Integer shuttleNo);
+ List<WrkMast> selectLiftStep223103();
+
+ WrkMast selectByWorkNo324104(Integer workNo);
+
+ List<WrkMast> selectBy2125();
+
+ //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
+ List<WrkMast> selectNoShuttleWrkByLev(String lev);
+
+ List<WrkMast> selectShuttleWrkByLev(String lev);
+
+ List<WrkMast> selectShuttleOutWrkByLev(String lev);
+
+ WrkMast selectLiftWrkMast(Integer liftNo);
+
+ WrkMast selectLiftWrkMastAndWrkNo(@Param("liftNo") Integer liftNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);
+
+ List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
+
+ WrkMast selectPickStepByBarcode(String barcode);
+
+ WrkMast selectShuttleHasMoveWorking(@Param("shuttleNo") Integer shuttleNo);
+
+ List<WrkMast> selectShuttleMoveWrk();
+
+ WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
+
+ WrkMast selectShuttleWorking2(@Param("shuttleNo") Integer shuttleNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
+
+
+ WrkMast selectByBarcode(String barcode);
+
+ List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟
+
+ WrkMast selectChargeWorking(Integer shuttleNo);
+
+ WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);
+
+ WrkMast selectWorkingPakout(Integer staNo);
+
+ WrkMast selectWorkingPakin(Integer staNo);
}
--
Gitblit v1.9.1