From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
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