From 77e54aec65693683bc2b9ac50e08df6a06c53493 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 17:03:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index b9b6e3f..9c50785 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -10,6 +10,9 @@
@Mapper
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
+
+ @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+ int saveLog(Long workNo);
WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
@@ -22,13 +25,15 @@
// 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")
+// @Select("select * 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 LIMIT 1")
WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+
+ WrkMast selectPakInStep111(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
// 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
+// @Select("select * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC LIMIT 1")
WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
/**
@@ -39,23 +44,30 @@
List<WrkMast> selectPakInStep12(@Param("crnNo")Integer crnNo);
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
+// @Select("select * from asr_wrk_mast where wrk_no=#{workNo} LIMIT 1")
WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
+ WrkMast selectWrkMastUnstackingOne212();
+
+ WrkMast selectPakInStep4(@Param("staNo")Integer staNo,@Param("sheetNo")String sheetNo);
+ WrkMast selectPakInStep5(@Param("staNo")Integer staNo,@Param("sheetNo")String sheetNo);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
-// @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)")
+// @Select("select * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104) LIMIT 1")
WrkMast selectPickStep(@Param("barcode")String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
+// @Select("select * from asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc LIMIT 1")
WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
+// @Select("select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC LIMIT 1")
WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakOutStep2345(@Param("sourceStaNo")Integer sourceStaNo,@Param("workNo")Integer workNo);
+
+ WrkMast selectPakOutStep3(@Param("sourceStaNo")Integer sourceStaNo);
// 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
+// @Select("select * from asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no LIMIT 1")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
@@ -252,6 +264,8 @@
* 鏌ユ壘鏄惁瀛樺湪鎷嗗灈鍗曟瀹屾垚鐨勫伐浣滄。
*/
WrkMast selectWrkMastUnstackingOne202(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWrkMastUnstackingOne202Two(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWrkMastUnstackingOne145(@Param("sourceStaNo")Integer sourceStaNo);
WrkMast selectWrkMastLabelingOne54();
--
Gitblit v1.9.1