From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库: 	显示在库信息,入库完成后显示成功入库的包数 	订单出库页面显示剩余待检包数 (PDA) 	未查询到的提示改为显示物料实际状态 	拣货单已完成,单据未完成 ✔ 	单据数量字段显示变更 ✔ 	拣货单按实际操作时间降序排序 ✔ 	拣货单明细导出 ✔ 	拣货单显示创建时间与操作时间 ✔

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 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..c954a6d 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,82 @@
 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);
+    }
+
+    @Override
+    public List<LocMast> selectLocByLev(Integer lev) {
+        return this.baseMapper.selectLocByLev(lev);
+    }
+
+
+
+    @Override
+    public List<LocMast> selectNodeLocByLev(String area, int lev) {
+        return this.baseMapper.selectNodeByLev(area,lev);
+    }
+
+    @Override
+    public LocMast selectLocStatus(String locno) {
+        return this.baseMapper.selectLocStatus(locno);
+    }
+
+
+
+    @Override
+    public List<LocMast> selectByLocNo(List<String> locNo) {
+        return this.baseMapper.selectByLocNo(locNo);
+    }
+
+
+
 }

--
Gitblit v1.9.1