From fdd8b1d79a9c899a0ad6dde6c17bef0a8488e6b0 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 12 九月 2022 13:20:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 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 6a0d9f6..44bdd07 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,17 +1,25 @@
 package com.zy.asrs.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 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 org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+    @Override
+    public Page<LocDetl> getPage(Page<LocDetl> page) {
+        page.setRecords(baseMapper.listByPage(page.getCondition()));
+        page.setTotal(baseMapper.listByPageCount(page.getCondition()));
+        return page;
+    }
 
     @Override
     public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -21,14 +29,14 @@
     }
 
     @Override
-    public boolean updateAnfme(Double anfme, String locNo, String matnr) {
+    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
         if (anfme <= 0) {
-            return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+            return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
         } else {
-            int res = baseMapper.updateAnfme(anfme, locNo, matnr);
-            return res > 0;
+            return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
         }
     }
+
 
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -39,4 +47,73 @@
     public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
     }
+
+
+    @Override
+    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
+        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public Double getSumAnfme(String matnr) {
+        return this.baseMapper.selectSumAnfmeByMatnr(matnr);
+    }
+
+    @Override
+    public List<LocDetl> selectPakoutByRule(String matnr) {
+        return this.baseMapper.selectPakoutByRule(matnr);
+    }
+
+    @Override
+    public List<LocDetl> getAsrsLocDetl(String matnr) {
+        return this.baseMapper.getAsrsLocDetl(matnr);
+    }
+
+    @Override
+    public Integer countLocNoNum(String locNo) {
+        return this.baseMapper.countLocNoNum(locNo);
+    }
+
+    @Override
+    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
+        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    }
+
+    @Override
+    public Double queryStockAnfme(String matnr, String batch) {
+        return this.baseMapper.queryStockAnfme(matnr, batch);
+    }
+
+    @Override
+    public List<StockVo> queryStockTotal() {
+        return this.baseMapper.queryStockTotal();
+    }
+
+    /**
+     * 鑾峰彇搴撳瓨鎬绘暟
+     * @return
+     */
+    @Override
+    public Integer sum() {
+
+        return this.baseMapper.sum();
+    }
+
+    @Override
+    public List<LocDetl> unreason() {
+        return this.baseMapper.unreason();
+    }
+
+
+    @Override
+    public LocDetl selectItem(String locNo, String matnr, String batch) {
+        return this.baseMapper.selectItem(locNo, matnr, batch);
+    }
+
+    @Override
+    public Double getLocDetlSumQty(String locNo) {
+        return this.baseMapper.selectLocDetlSumQty(locNo);
+    }
 }

--
Gitblit v1.9.1