From 6704225b102b684e6ce4e88fa897414fac06c9f1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 26 四月 2021 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/LocNormalController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 6fc012c..cb1c130 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -166,9 +166,9 @@
@RequestMapping(value = "/locNormal/pda/out/query")
@ManagerAuth(memo = "pda鍑哄簱鏌ヨ")
@Transactional
- public R locNormalPdaOutQuery(String matnr, String warehouse) {
+ public R locNormalPdaOutQuery(String matnr, String warehouse, String billNo) {
List<LocNormal> list = new ArrayList<>();
- list = locNormalService.pdaLocNormalQuery(matnr, warehouse);
+ list = locNormalService.pdaLocNormalQuery(matnr, warehouse, billNo);
return R.ok(list);
}
--
Gitblit v1.9.1