From a3e47b54c53c9ac2afa0423cda5577e9b768d643 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 10:05:04 +0800
Subject: [PATCH] bug调整

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   53 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 12 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 2698d7b..4df3e6c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,15 +1,17 @@
 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.OrderDetl;
 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 com.zy.asrs.utils.MatCompareUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -52,8 +54,8 @@
     }
 
     @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);
     }
 
 
@@ -84,10 +86,31 @@
         return this.baseMapper.countLocNoNum(locNo);
     }
 
+//    @Override
+//    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 matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    public List<LocDetl> queryStock(OrderDetl orderDetl) {
+        List<LocDetl> data = new ArrayList<>();
+        List<LocDetl> locDetls = this.baseMapper.queryStock(null, orderDetl.getMatnr(), null, null, null);
+        if (locDetls == null) {
+            return null;
+        }
+        for (LocDetl locDetl : locDetls) {
+            if (MatCompareUtils.compare(locDetl, orderDetl)) {
+                data.add(locDetl);
+            }
+        }
+        return data;
     }
+
+    @Override
+    public List<LocDetl> queryStockByModel(String model) {
+        return this.baseMapper.queryStock(null, model, null, null, null);
+    }
+
 
     @Override
     public Double queryStockAnfme(String matnr, String batch) {
@@ -101,6 +124,7 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @Override
@@ -121,28 +145,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