From cc3b8857e340360e08aedbe81de7d82df7c1b644 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 七月 2023 15:33:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c56e2b5..21d5f1c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -52,6 +52,16 @@
return R.ok();
}
+ /**
+ * 缁勬墭-鎵归噺
+ */
+ @RequestMapping("/comb/auth/batch")
+ @ManagerAuth(memo = "缁勬墭-鎵归噺")
+ public R combBatch(@RequestBody CombParam combParam){
+ mobileService.combBatch(combParam, getUserId());
+ return R.ok();
+ }
+
/**
* 缁勬墭
@@ -126,8 +136,15 @@
*/
@RequestMapping("/bill/query/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
- public R billQuery(@RequestParam String billNo){
- List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).isNull("zpallet"));
+ public R billQuery(@RequestParam String billNo,
+ @RequestParam String mnemonic){
+ EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
+ if(mnemonic == "") {
+ wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet");
+ } else {
+ wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet").and().like("mnemonic",mnemonic);
+ }
+ List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitPakins)) {
for (WaitPakin waitPakin : waitPakins) {
--
Gitblit v1.9.1