From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index c1fa598..035c797 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -39,6 +39,11 @@
}
@Override
+ public List<LocMast> selectAreaEmptyByLev(Short locType1, Integer locType3, Integer lev) {
+ return this.baseMapper.selectAreaEmptyByLev(locType1, locType3, lev);
+ }
+
+ @Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
if (Cools.isEmpty(sourceLocNo)) {
return null;
@@ -150,6 +155,9 @@
List<String> groupLoc = Utils.getGroupLoc(locNo);
for (String loc : groupLoc) {
LocMast tmp = this.baseMapper.selectByLoc(loc);
+ if (tmp == null) {
+ continue;
+ }
if (tmp.getLocSts().equals("O")) {
return tmp;
}
@@ -199,7 +207,11 @@
}
public void updateByLocNo(LocMast locMast){
-
this.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo()));
}
+
+ @Override
+ public List<LocMast> selectLocDetlNotExist() {
+ return this.baseMapper.selectLocDetlNotExist();
+ }
}
--
Gitblit v1.9.1