From 6751d283289bd10d2ad97ddff65de64046d89c6b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 14:39:28 +0800
Subject: [PATCH] 地图显示行号

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index ff27e08..2008981 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -2,13 +2,17 @@
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.common.model.QueryStockPreDo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Service("locDetlService")
@@ -26,7 +30,16 @@
         if (anfme <= 0) {
             return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
         } else {
-            return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+            return baseMapper.updateAnfme(anfme, locNo, matnr, batch, null, null) > 0;
+        }
+    }
+
+    @Override
+    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String manu, String memo) {
+        if (anfme <= 0) {
+            return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+        } else {
+            return baseMapper.updateAnfme(anfme, locNo, matnr, batch, manu, memo) > 0;
         }
     }
 
@@ -36,8 +49,8 @@
     }
 
     @Override
-    public List<String> getSameDetl(String matnr, Integer start, Integer end) {
-        return this.baseMapper.selectSameDetl(matnr, start, end);
+    public List<String> getSameDetl(String matnr) {
+        return this.baseMapper.selectSameDetl(matnr);
     }
 
     @Override
@@ -49,6 +62,12 @@
     @Override
     public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
         page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+        return page;
+    }
+    @Override
+    public Page<LocDetl> getStockStatis2(Page<LocDetl> page) {
+        page.setRecords(baseMapper.getStockStatis2(page.getCondition()));
         page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
         return page;
     }
@@ -75,7 +94,13 @@
 
     @Override
     public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+        List<LocDetl> result = new ArrayList<>();
+        List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr, batch);
+        for (QueryStockPreDo preDo : preDos) {
+            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, batch, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
+            result.addAll(locDetls);
+        }
+        return result;
     }
 
     @Override
@@ -103,9 +128,43 @@
         return this.baseMapper.unreason();
     }
 
+    /**
+     * 閫氳繃鐗╂枡浠ｇ爜鑾峰彇搴撳瓨鎬绘暟閲�
+     * @param matnr
+     * @return
+     */
+    @Override
+    public Double selectSumByMatnr(String matnr) {
+        Double aDouble = this.baseMapper.selectSumByMatnr(matnr);
+        if (aDouble == null) {
+            return 0.0;
+        }else {
+            return aDouble;
+
+        }
+    }
+
+    @Override
+    public List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit) {
+        return this.baseMapper.selectGroupPage(param);
+    }
+
+    @Override
+    public List<LocDetl> selectByLocNo(String locNo) {
+        return this.baseMapper.selectByLocNo(locNo);
+    }
+
 
     @Override
     public LocDetl selectItem(String locNo, String matnr, String batch) {
         return this.baseMapper.selectItem(locNo, matnr, batch);
     }
+
+    @Override
+    public List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo) {
+        if (Cools.isEmpty(orderNo) && Cools.isEmpty(matnr) && Cools.isEmpty(maktx) && Cools.isEmpty(specs) && Cools.isEmpty(locNo)) {
+            return new ArrayList<LocDetl>();
+        }
+        return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
+    }
 }

--
Gitblit v1.9.1