From fe2ac1e9580172bc3341553032fb2679e70fd42a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 十二月 2024 10:46:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   68 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 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 65ea1c8..23ba656 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -9,14 +9,30 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+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) {
         page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
         page.setTotal(baseMapper.getStockOutPageCount(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;
     }
 
@@ -29,6 +45,7 @@
         }
     }
 
+
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
         return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
@@ -37,6 +54,11 @@
     @Override
     public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
+    }
+
+    @Override
+    public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
+        return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
     }
 
 
@@ -68,8 +90,8 @@
     }
 
     @Override
-    public List<LocDetl> queryStock(String matnr, String batch, String orderNo) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo);
+    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
+        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
     }
 
     @Override
@@ -82,8 +104,50 @@
         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);
+    }
+
+    @Override
+    public void updateMatTurn(String matnrOld,String matnr){
+        this.baseMapper.updateMatTurn(matnrOld,matnr);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
+        if (crnNo==1){
+            return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
+        }
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
+    }
+
+    @Override
+    public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) {
+        if (crnNo==1){
+            return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade);
+        }
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
+    }
 }

--
Gitblit v1.9.1