From eb9e30160e01dbf905d5514c3b6a07f5d12023ff Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 25 五月 2023 16:06:31 +0800
Subject: [PATCH] 入库找库位逻辑

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 14d108e..7004ae0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -79,9 +79,10 @@
         if (locMast == null) {
             return false;
         }
-        boolean res = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
+        Integer nowQua = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+        boolean res = nowQua > quaOfBlank;
         if (!res) {
-            log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank);
+            log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
         }
         return res;
     }
@@ -203,4 +204,23 @@
         this.baseMapper.updateLocSts(locNo,locSts);
     }
 
+    @Override
+    public LocMast findOutMast(Short locType1, List<Integer> crnNos) {
+        return this.baseMapper.findOutMast(locType1, crnNos);
+    }
+
+    @Override
+    public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
+        return this.baseMapper.findInEmptyLocMast(locType1, rows);
+    }
+
+    @Override
+    public LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
+        return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+    }
+
+    @Override
+    public LocMast findEmptyLowFrequencyLocMast(Short locType1) {
+        return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+    }
 }

--
Gitblit v1.9.1