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/LocNormalServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 1a27ccd..4d32ff0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -46,8 +46,8 @@
     }
 
     @Override
-    public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse) {
-       return baseMapper.pdaLocNormalQuery(matnr, warehouse);
+    public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo) {
+       return baseMapper.pdaLocNormalQuery(matnr, warehouse, billNo);
     }
 
     @Override
@@ -62,4 +62,14 @@
             }
         }
     }
+
+    @Override
+    public List<LocNormal> pdaLocNormalWarehouseQuery(String warehouse, String matnr) {
+        return baseMapper.pdaLocNormalWarehouseQuery(warehouse, matnr);
+    }
+
+    @Override
+    public void pdaLocNormalMove(List<LocNormal> list) {
+        baseMapper.pdaLocNormalMove(list);
+    }
 }

--
Gitblit v1.9.1