From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 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 b8f12ff..a129b29 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -53,11 +53,12 @@
     }
 
     @Override
-    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
+    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch,
+                               String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         if (anfme <= 0) {
-            return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
+            return this.baseMapper.deleteItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
         } else {
-            return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+            return baseMapper.updateAnfme(anfme, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
         }
     }
 
@@ -73,8 +74,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);
     }
 
 
@@ -110,6 +111,12 @@
         return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
     }
 
+
+    @Override
+    public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+        return this.baseMapper.queryStockAll(orderNo, locNos, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
+    }
+
     @Override
     public Double queryStockAnfme(String matnr, String batch) {
         return this.baseMapper.queryStockAnfme(matnr, batch);
@@ -122,6 +129,7 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @Override
@@ -137,8 +145,8 @@
 
 
     @Override
-    public LocDetl selectItem(String locNo, String matnr, String batch) {
-        return this.baseMapper.selectItem(locNo, matnr, batch);
+    public LocDetl selectItem(String locNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+        return this.baseMapper.selectItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
     }
 
     @Override
@@ -147,24 +155,24 @@
     }
 
     @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);
     }
 
     @Override
@@ -178,7 +186,7 @@
     @Override
     public R frozenInventory(List<FrozenParam> param) {
 
-        for(FrozenParam obj : param) {
+        for (FrozenParam obj : param) {
             this.baseMapper.frozenInventory(obj.getLocNo(), obj.getMatnr(), obj.getBatch(), 1);
         }
 
@@ -188,7 +196,7 @@
     @Override
     public R unfreezeInventory(List<FrozenParam> param) {
 
-        for(FrozenParam obj : param) {
+        for (FrozenParam obj : param) {
             this.baseMapper.frozenInventory(obj.getLocNo(), obj.getMatnr(), obj.getBatch(), 0);
         }
 

--
Gitblit v1.9.1