From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 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 2a882be..b5f964f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,8 +1,10 @@
 package com.zy.asrs.service.impl;
 
+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;
@@ -50,15 +52,15 @@
     }
 
     @Override
-    public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
-        return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
+    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;
     }
 
@@ -84,8 +86,19 @@
 
     @Override
     public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, 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) {
@@ -99,6 +112,7 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @Override
@@ -119,28 +133,33 @@
     }
 
     @Override
+    public LocDetl selectItem2(String locNo, String matnr) {
+        return this.baseMapper.selectItem2(locNo, matnr);
+    }
+
+    @Override
     public Double getLocDetlSumQty(String locNo) {
         return this.baseMapper.selectLocDetlSumQty(locNo);
     }
 
     @Override
-    public void updateMatTurn(String matnrOld,String matnr){
-        this.baseMapper.updateMatTurn(matnrOld,matnr);
+    public void updateMatTurn(String matnrOld, String matnr) {
+        this.baseMapper.updateMatTurn(matnrOld, matnr);
     }
 
     @Override
     public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
-        if (crnNo==1){
+        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);
+    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);
+        return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
     }
 }

--
Gitblit v1.9.1