From 2186547feee072757aba26c7b496831bcb13d696 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 29 五月 2023 16:42:41 +0800
Subject: [PATCH] 库位地图优化,优化加载速度,增加地图缩放功能,增加刷新重置功能,楼层切换变更方式,楼层切换保留搜索结果

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

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 6b2cfa3..004592e 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.result.StockVo;
+import com.zy.common.model.QueryStockPreDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -11,7 +12,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Mapper
 @Repository
@@ -29,6 +29,8 @@
 
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
+
+    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);
@@ -50,7 +52,9 @@
 
     // -------------------------------------------------
 
-    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+    List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
+
+    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);
 
@@ -61,4 +65,10 @@
 
     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);
+
 }

--
Gitblit v1.9.1