From 68c167f1e6e3a82c37106db8ce956d1342799863 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 24 十月 2023 17:23:51 +0800
Subject: [PATCH] 补货单流程更新

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

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 8ac825d..71723d3 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -23,6 +23,12 @@
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
 
+	//鍒嗛〉鏌ヨAGV鍜屽洓椤瑰簱搴撳瓨婊炵暀鏃堕棿
+	public List<ViewStayTimeBean> queryAllViewStayTimeList(ViewStayTimeBean viewStayTime);
+	public int getAllViewStayTimeCount(ViewStayTimeBean viewStayTime);
+	//涓嶅垎椤垫煡璇GV鍜屽洓椤瑰簱鎵�鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+	public List<ViewStayTimeBean> getAllViewStayTimeAll(ViewStayTimeBean viewStayTime);
+
 //	// 搴撲綅Map
 	@Select("select distinct row1 from asr_loc_mast order by row1 asc")
 	List<Integer> getViewLocRowTotal();
@@ -30,7 +36,7 @@
 	@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 from asr_loc_mast where row1=#{row1} and lev1=#{lev1} and status=0 order by bay1")
 	public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
 
 	// 搴撲綅Map
@@ -60,6 +66,8 @@
 	public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+	public List<ViewWorkInBean> getViewWorkOutERP();
 
 
 	// ------鍥捐〃

--
Gitblit v1.9.1