From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 7bdc702..f78510a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -41,10 +41,10 @@
     }
 
     @Override
-    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
+    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
         List<LocDetl> allLocDetlData = baseMapper.getAllLocDetlData(loc_no, matnr);
         for (int i = 0; i < allLocDetlData.size(); i++) {
-            allLocDetlData.get(i).setMatStatusFlag(matStatusFlag);
+            allLocDetlData.get(i).setMatStatus(mat_status);
         }
         baseMapper.updateMatStatus(allLocDetlData);
         return baseMapper.getAllLocDetlData(loc_no, matnr);

--
Gitblit v1.9.1