From 46755eb8202cc463e234eda1daa0481b8e462293 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 14:51:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index e748e0d..fb466b9 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,7 +1,6 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -12,13 +11,6 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
- WrkMast selectBySourceLocNo(@Param("sourceLocNo") String sourceLocNo);
-
-// @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 * 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")
@@ -26,25 +18,7 @@
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
- // 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @Select("select top 1 * 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("wrkNo")Short wrkNo);
-
- WrkMast selectWorking(@Param("crnNo")Integer crnNo);
-
- // work log -------------------------------------------------------
- @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
- int saveWrkMastLog(Integer workNo);
-
- @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
- int saveWrkDetlLog(Integer workNo);
-
- @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
- int setSteEmpty(Integer wrkNo);
-
- List<WrkMast> selectAll(@Param("staNo")Integer staNo);
-
- WrkMast selectRackInStep4(Short workNo,Integer staNo);
+ List<WrkMast> selectInStep4();
WrkMast selectByWorkNo(Integer workNo);
@@ -54,14 +28,11 @@
List<WrkMast> selectBy2125();
- //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
- List<WrkMast> selectNoShuttleWrkByLev(String lev);
-
List<WrkMast> selectShuttleWrkByLev(String lev);
- WrkMast selectLiftWrkMast(Integer liftNo);
+ List<WrkMast> selectShuttleOutWrkByLev(String lev);
- List<WrkMast> selectInOutWrkMast();//鏌ヨ鍑哄叆搴撳伐浣滄。
+ List<WrkMast> selectLiftWrkMast(Integer liftNo);
List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
@@ -72,4 +43,13 @@
List<WrkMast> selectShuttleMoveWrk();
WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//鏄惁鏈夌┛姊溅浠诲姟(绉诲簱浠诲姟闄ゅ)
+
+ WrkMast selectByBarcode(String barcode);
+
+ List<WrkMast> selectInWrkMastByLiftNo(Integer liftNo);//鎼滅储鎸囧畾鎻愬崌鏈虹殑鍏ュ簱浠诲姟
+
+ WrkMast selectChargeWorking(Integer shuttleNo);
+
+ WrkMast selectChargeWorkingByChargeSta(Integer chargeSta);
+
}
--
Gitblit v1.9.1