From 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十一月 2024 10:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   68 ++++++++++++++++++++++++++++++++-
 1 files changed, 65 insertions(+), 3 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..2a882be 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,26 @@
 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.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 +38,7 @@
         }
     }
 
+
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
         return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
@@ -37,6 +47,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 +83,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
@@ -78,7 +93,54 @@
     }
 
     @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