From 613a4f53f24672cc7e202f6f40a9d51bae904e40 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 28 三月 2024 14:12:45 +0800
Subject: [PATCH] #平库转立库
---
src/main/java/com/zy/asrs/controller/MobileController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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..e85a9de 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -52,6 +52,23 @@
return R.ok();
}
+ @RequestMapping("/combLtoP/auth")
+ @ManagerAuth(memo = "绉诲簱缁勬墭")
+ public R combLtoP(@RequestBody CombParam combParam){
+ mobileService.combLtoP(combParam, getUserId());
+ return R.ok();
+ }
+
+ /**
+ * 缁勬墭-鎵归噺
+ */
+ @RequestMapping("/comb/auth/batch")
+ @ManagerAuth(memo = "缁勬墭-鎵归噺")
+ public R combBatch(@RequestBody CombParam combParam){
+ mobileService.combBatch(combParam, getUserId());
+ return R.ok();
+ }
+
/**
* 缁勬墭
@@ -126,8 +143,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