From 15c8f00ab3a1e3d2d96b56bae0ec11efedd60231 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 29 九月 2021 11:14:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..a68185b 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();
+ }
+
/**
* 缁勬墭
@@ -127,7 +137,7 @@
@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"));
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet"));
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitPakins)) {
for (WaitPakin waitPakin : waitPakins) {
--
Gitblit v1.9.1