From 525cf3d9714352284b70c29f81fa73bff71cf683 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 14 七月 2023 08:11:55 +0800
Subject: [PATCH] 完善AGV相关功能
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 4 +++-
1 files changed, 3 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..a816b9c 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -30,7 +30,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 +60,8 @@
public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+ public List<ViewWorkInBean> getViewWorkOutERP();
// ------鍥捐〃
--
Gitblit v1.9.1