From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
index 323374f..dfe98c9 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
@@ -25,7 +25,8 @@
@Override
public List<ManPakOut> selectByLocType(String locType) {
- return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType).eq("status",1));
+ return this.selectList(new EntityWrapper<ManPakOut>().like("loc_no",locType+"-")
+ .andNew().eq("status",0).or().eq("status",8));
}
@Override
--
Gitblit v1.9.1