From d7cbe984b51fb8fa509890809aa75e6416168249 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 19 八月 2024 08:20:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   88 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 82 insertions(+), 6 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 23a6c91..db27d05 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,28 @@
 package com.zy.asrs.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
+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.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) {
@@ -29,6 +40,7 @@
         }
     }
 
+
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
         return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
@@ -39,11 +51,16 @@
         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);
+    }
+
 
     @Override
-    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
-        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
-        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+    public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
+        page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
+        page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
         return page;
     }
 
@@ -68,9 +85,20 @@
     }
 
     @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(null, matnr, batch, orderNo, locNos);
     }
+
+    @Override
+    public List<LocDetl> queryStock(String spgNo) {
+        return this.baseMapper.queryStock(spgNo, null, null, null, null);
+    }
+
+    @Override
+    public List<LocDetl> queryStockByModel(String model) {
+        return this.baseMapper.queryStock(null, model, null, null, null);
+    }
+
 
     @Override
     public Double queryStockAnfme(String matnr, String batch) {
@@ -78,7 +106,55 @@
     }
 
     @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);
+    }
+
+    @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