From a5ee5055f053cbb4f13710fc251adbd780f3a43f Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 31 八月 2022 17:28:52 +0800
Subject: [PATCH] #
---
src/main/java/com/slcf/dao/WaitPakOutDao.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/slcf/dao/WaitPakOutDao.java b/src/main/java/com/slcf/dao/WaitPakOutDao.java
index fedf22f..420935d 100644
--- a/src/main/java/com/slcf/dao/WaitPakOutDao.java
+++ b/src/main/java/com/slcf/dao/WaitPakOutDao.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.slcf.bean.WaitPakOutLogCondition;
+import com.slcf.pojo.WaitPakOutLogBean;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
@@ -125,6 +127,12 @@
* 鏌ヨ鏈�鏃╀竴绗斿緟鎵撳嵃鏍囩鏁版嵁,action=2鍗曠嫭鎵撳嵃妯″紡锛宲rnstatus=1闇�姹傛墦鍗扮姸鎬�
* @return
*/
- @Select("select top 1 * from cust_wait_pakout where status='Y' and io_status='N' and action=2 and prnstatus=1 order by io_status desc,modi_time asc")
+ @Select("select top 1 * from cust_wait_pakout where status='Y' and io_status='N' and action=2 and (prnstatus=1 or prnstatus=3) order by io_status desc,modi_time asc")
public WaitPakOutBean getWaitPakOutPrint();
+
+ /**
+ * 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ * @return
+ */
+ public List<WaitPakOutBean> getWaitPakOutAll(WaitPakOutCondition condition);
}
--
Gitblit v1.9.1