From a85a8d0c33d4a821a98a0ff6789298a23a180006 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 28 四月 2025 14:39:45 +0800
Subject: [PATCH] 拣货单出库完成，但是库存没减，日志埋点

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   93 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 88 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 8cc6a1f..e13669c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -2,12 +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.LocDetlWarningDTO;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
 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.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -22,9 +27,17 @@
     }
 
     @Override
-    public Page<LocDetl> getStockOut(Page<LocDetl> page) {
-        page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
-        page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+    public Page<LocDetl> getStockOut(Page<LocDetl> page,String view) {
+        if (view.equals("1")){
+            page.setRecords(baseMapper.getStockOutPage2(page.getCondition()));
+            page.setTotal(baseMapper.getStockOutPageCount2(page.getCondition()));
+        }else if (view.equals("2")){
+            page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+            page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+        }else {
+            page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+            page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+        }
         return page;
     }
 
@@ -57,6 +70,25 @@
     }
 
     @Override
+    public Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page) {
+        page.setRecords(baseMapper.getStockStatisAll(page.getCondition()));
+        page.setTotal(baseMapper.getStockStatisCountAll(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page) {
+        page.setRecords(baseMapper.getWarningNumList(page.getCondition()));
+        page.setTotal(baseMapper.getWarningNumListCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public Double sumAll() {
+        return this.baseMapper.sumAll();
+    }
+
+    @Override
     public Double getSumAnfme(String matnr) {
         return this.baseMapper.selectSumAnfmeByMatnr(matnr);
     }
@@ -77,8 +109,18 @@
     }
 
     @Override
-    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    public List<LocDetl> queryStock(String matnr, String batch, int owner) {
+        return this.baseMapper.queryStock(matnr, batch, owner);
+    }
+
+    @Override
+    public List<LocDetl> queryStock2(String matnr, String batch) {
+        return this.baseMapper.queryStock2(matnr, batch);
+    }
+
+    @Override
+    public List<LocDetl> queryStockViewMerge(String locNo) {
+        return this.baseMapper.queryStockViewMerge(locNo);
     }
 
     @Override
@@ -118,4 +160,45 @@
     public Double getLocDetlSumQty(String locNo) {
         return this.baseMapper.selectLocDetlSumQty(locNo);
     }
+
+    @Override
+    public Integer queryStockViewMergeCount(int row,int lev){return this.baseMapper.queryStockViewMergeCount(row,lev);}
+
+    @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);
+    }
+
+    @Override
+    public List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO) {
+        return this.baseMapper.selectAllOwner(locDetlDTO);
+    }
+
+    @Override
+    public List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO) {
+        return this.baseMapper.selectAllPyment(locDetlDTO);
+    }
+
+    @Override
+    public int selectAllCount(LocDetlDTO locDetlDTO) {
+        return this.baseMapper.selectAllCount(locDetlDTO);
+    }
+
+    @Override
+    public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
+        return this.baseMapper.selectAllPymentcount(locDetlDTO);
+    }
+
+    @Override
+    public List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO) {
+        return this.baseMapper.selectAllWarning(locDetlWarningDTO);
+    }
+
+    @Override
+    public int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO) {
+        return this.baseMapper.getAllWarningCount(locDetlWarningDTO);
+    }
 }

--
Gitblit v1.9.1