From 3cc2632faea335273c67d8dbaf105ee49b2caa77 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 16 七月 2022 16:48:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 20eacbe..9438b0d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -6,10 +6,7 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocNormalLog;
-import com.zy.asrs.entity.LocNormal;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WaitPakinLog;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.ERPselectParam;
 import com.zy.asrs.mapper.LocNormalMapper;
 import com.zy.asrs.mapper.OutStockMapper;
@@ -513,12 +510,16 @@
     }
 
     @Override
-    public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic) {
+    public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic,String matnr) {
         List<OutStockBillEntry> matList = outStockMapper.queryMatnrWithBillNo(fbillNo);
         List<LocNormal> locNormal = new ArrayList<>();
         List<LocNormal> locNormalResult = new ArrayList<>();
         for (Integer i = 0; i < matList.size(); i++) {
-            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
+            if(matList.get(i).getFnumber().equals(matnr)){
+                locNormal = baseMapper.queryLocNorlMatnr(matnr, mnemonic);
+            }else {
+                continue;
+            }
             if (locNormal.size() > 0) {
                 for (LocNormal e:locNormal) {
                     LocNormal obj = new LocNormal();
@@ -546,4 +547,8 @@
         }
        return locNormalResult;
     }
+
+    public Integer getAllLocDetlData(List<LocNormal> list) {
+        return baseMapper.updateMatStatus(list);
+    }
 }

--
Gitblit v1.9.1