From ff6d68f7c7e9fb4fd7b884eb282aa5f9e1a5d0ba Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 16:21:47 +0800
Subject: [PATCH] 初步改完，接下来进行测试

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |  101 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 78 insertions(+), 23 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 4df3e6c..c22d465 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,6 +5,8 @@
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.StockStatisDTO;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
@@ -14,7 +16,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -34,14 +35,40 @@
     }
 
     @Override
-    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
-        if (anfme <= 0) {
-            return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
-        } else {
-            return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+    public boolean updateAnfme(Double anfme, String locNo, WrkDetl wrkDetl) {
+        List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, wrkDetl.getMatnr());
+        if (locDetls.isEmpty()) {
+            return false;
         }
+        for (LocDetl locDetl : locDetls) {
+            if (MatCompareUtils.compare(locDetl, wrkDetl)) {
+                if (anfme <= 0) {
+                    return this.baseMapper.deleteItem(locDetl.getLocNo(), locDetl) > 0;
+                } else {
+                    return baseMapper.updateAnfme(anfme, locNo, locDetl) > 0;
+                }
+            }
+        }
+        return false;
     }
 
+    @Override
+    public boolean updateAnfme(Double anfme, String locNo, LocDetl wrkDetl) {
+        List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, wrkDetl.getMatnr());
+        if (locDetls.isEmpty()) {
+            return false;
+        }
+        for (LocDetl locDetl : locDetls) {
+            if (MatCompareUtils.compare(locDetl, wrkDetl)) {
+                if (anfme <= 0) {
+                    return this.baseMapper.deleteItem(locDetl.getLocNo(), locDetl) > 0;
+                } else {
+                    return baseMapper.updateAnfme(anfme, locNo, locDetl) > 0;
+                }
+            }
+        }
+        return false;
+    }
 
     @Override
     public boolean updateLocNo(String newLocNo, String oldLocNo) {
@@ -106,16 +133,16 @@
         return data;
     }
 
-    @Override
-    public List<LocDetl> queryStockByModel(String model) {
-        return this.baseMapper.queryStock(null, model, 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) {
-        return this.baseMapper.queryStockAnfme(matnr, batch);
-    }
+//    @Override
+//    public Double queryStockAnfme(String matnr, String batch) {
+//        return this.baseMapper.queryStockAnfme(matnr, batch);
+//    }
 
     @Override
     public List<StockVo> queryStockTotal() {
@@ -139,15 +166,15 @@
     }
 
 
-    @Override
-    public LocDetl selectItem(String locNo, String matnr, String batch) {
-        return this.baseMapper.selectItem(locNo, matnr, batch);
-    }
-
-    @Override
-    public LocDetl selectItem2(String locNo, String matnr) {
-        return this.baseMapper.selectItem2(locNo, matnr);
-    }
+//    @Override
+//    public LocDetl selectItem(String locNo, String matnr, String batch) {
+//        return this.baseMapper.selectItem(locNo, matnr, batch);
+//    }
+//
+//    @Override
+//    public LocDetl selectItem2(String locNo, String matnr) {
+//        return this.baseMapper.selectItem2(locNo, matnr);
+//    }
 
     @Override
     public Double getLocDetlSumQty(String locNo) {
@@ -174,4 +201,32 @@
         }
         return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
     }
+
+    @Override
+    public LocDetl selectItem(String locNo, WrkDetl wrkDetl) {
+        List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, wrkDetl.getMatnr());
+        if (locDetls != null) {
+            for (LocDetl locDetl : locDetls) {
+                if (MatCompareUtils.compare(locDetl, wrkDetl)) {
+                    return locDetl;
+                }
+            }
+        }
+        return null;
+    }
+
+
+    @Override
+    public LocDetl selectItem(String locNo, StockOutParam.LocDetl locDetl) {
+        List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, locDetl.getMatnr());
+        if (locDetls != null) {
+            for (LocDetl detl : locDetls) {
+                if (MatCompareUtils.compare(locDetl, detl)) {
+                    return detl;
+                }
+            }
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.1