From ef811df34e156ea6d253fbfa12c76b4c0a593840 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 14:27:11 +0800
Subject: [PATCH] 基础数据err
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 6 +++++-
1 files changed, 5 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 6a804db..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
@@ -52,12 +52,16 @@
public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+ public List<ViewWorkInBean> getViewWorkInERP();
//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤
+ public List<ViewWorkInBean> getViewWorkOutERP();
// ------鍥捐〃
--
Gitblit v1.9.1