From 735c99bbbcba0fc0a68e60bec4d6e8c64b9d729d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 08 十月 2024 09:39:28 +0800
Subject: [PATCH] --

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f0208a0..104572f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -60,10 +60,12 @@
 
     }
 
-    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq,String type) {
         //鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
         Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
-
+        if (type != null) {
+            wrapper.notLike("loc_no", "F1");
+        }
         wapperSetCondition(wrapper,"batch",batch);
         wapperSetCondition(wrapper,"three_code",csocode);
         wapperSetCondition(wrapper,"dead_time",isoseq);
@@ -142,6 +144,11 @@
         return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
     }
 
+    @Override
+    public Double getSumAnfmeback(String matnr, String threeCode,Integer floor) {
+        return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
+    }
+
     /*
         鑾峰彇搴撳瓨鎬绘暟
          */

--
Gitblit v1.9.1