From 00e1f09d1ce3ed8ab3a9976d7b7af7ef558625af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 16:41:21 +0800
Subject: [PATCH] AGV工作档取消和完成

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 50b548b..1e1303a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -17,7 +17,7 @@
 @Repository
 public interface LocDetlMapper extends BaseMapper<LocDetl> {
 
-    LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+    LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,@Param("suppCode")String suppCode);
 
     int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
 
@@ -30,8 +30,7 @@
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
 
-    @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE 1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' ORDER BY lm.modi_time ASC")
-    List<String> selectSameDetl(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
+    List<String> selectSameDetl(@Param("matnr") String matnr);
 
     @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end})  AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
     List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
@@ -55,7 +54,7 @@
 
     List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
 
-    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("bay") Integer bay);
+    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("orderBy") String orderBy, @Param("bay") Integer bay);
 
     Double queryStockAnfme(String matnr, String batch);
 
@@ -66,4 +65,13 @@
 
     List<LocDetl> unreason();
 
+    List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+
+    List<LocDetl> selectByLocNo(String locNo);
+
+    int updateStockFreeze(String matnr, String locNo, Integer stockFreeze);
+
+    @Select("SELECT loc_no FROM asr_loc_detl WHERE matnr = #{matnr} GROUP BY loc_no")
+    List<String> selectLocNo(@Param("matnr") String matnr);
+
 }

--
Gitblit v1.9.1