From f10169ec96e281abd2d68064ca855e48e9dc9e6a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 20 六月 2022 15:54:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 45c15df..e6ce450 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,16 +1,55 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.RowLastnoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
+ @Autowired
+ 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)) {
+ return null;
+ }
+ LocMast sourceStock = this.selectById(sourceLocNo);
+ if (Cools.isEmpty(sourceStock)) {
+ 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