From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 56fdfbf..0eaa2a2 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -34,20 +34,20 @@
 	@Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
 	public List<String> getViewLocLevCount(@Param("row1") int row1);
 //
-	@Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+	@Select("select loc_no as locNo, bay1,loc_sts as locSts, loc_type2 as locType2 from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
 	public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
 
 	// 搴撲綅Map
 	@Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
 	public List<String> getViewLocBayCount(@Param("row1") int row1);
-	@Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
+	@Select("select lev1,loc_sts as locSts, loc_type2 as locType2 from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
 	public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
 	@Select("SELECT DISTINCT row1 FROM asr_loc_mast ORDER BY row1 ASC")
 	List<Integer> getAllRows();
 	@Select("SELECT DISTINCT bay1 FROM asr_loc_mast ORDER BY bay1 ASC")
 	List<String> getAllBays();
 
-	@Select("SELECT row1,lev1,bay1,loc_no as locNo,loc_sts as locSts FROM asr_loc_mast WHERE lev1 = #{layer} ORDER BY row1 ASC, bay1 ASC")
+	@Select("SELECT row1,lev1,bay1,loc_no as locNo,loc_sts as locSts, loc_type2 as locType2 FROM asr_loc_mast WHERE lev1 = #{layer} ORDER BY row1 ASC, bay1 ASC")
 	List<ViewLocMapDto> getLocMapByLayer(@Param("layer") Integer layer);
 	//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
 	public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);

--
Gitblit v1.9.1