From ddfa8220125b528f0e391a7842c2583d1c4c75ee Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 04 一月 2023 15:59:51 +0800
Subject: [PATCH] #中间表对接:ERP与LK库存校对完成

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 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 260df2a..e6ce450 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.LocMastService;
@@ -19,19 +19,37 @@
     private RowLastnoService rowLastnoService;
 
     @Override
-    public LocMast queryFreeLocMast(Integer row) {
-        return this.baseMapper.queryFreeLocMast(row);
+    public LocMast queryFreeLocMast(Integer row, Short locType1) {
+        return this.baseMapper.queryFreeLocMast(row, locType1);
     }
 
     @Override
     public List<String> queryGroupEmptyStock(String sourceLocNo) {
         if (Cools.isEmpty(sourceLocNo)) {
-            throw new CoolException("婧愬簱浣嶄笉鑳戒负绌�");
+            return null;
         }
         LocMast sourceStock = this.selectById(sourceLocNo);
         if (Cools.isEmpty(sourceStock)) {
-            throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+            return null;
         }
         return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
     }
+
+    @Override
+    public Boolean checkEmptyCount(LocMast locMast) {
+        if (locMast == null) {
+            return false;
+        }
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+    }
+
+    @Override
+    public Boolean checkWhole(List<LocDetl> locDetls) {
+        return null;
+    }
+
+    @Override
+    public List<LocMast> queryShallowLocFMast(Integer crnNo) {
+        return this.baseMapper.queryShallowLocFMast(crnNo);
+    }
 }

--
Gitblit v1.9.1