From 96fc6c344e23e0180881b87aa2291a2fc19e4ab8 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 14 四月 2023 12:55:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bc4acfb..ec47bd4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -53,6 +53,9 @@
@ManagerAuth
public R pikingAuth(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(barcode + "鏆傛棤宸ヤ綔妗�");
+ }
if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
}
@@ -345,7 +348,7 @@
@ManagerAuth
public R getCheckDetl2(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
- if(Cools.isEmpty()){
+ if(Cools.isEmpty(wrkMast)){
throw new CoolException("姝ゆ墭鐩樼爜娌℃湁鐩樼偣浠诲姟");
}
if (wrkMast.getIoType() != 107){
@@ -365,9 +368,14 @@
@RequestMapping("/adjustNew/auth")
@ManagerAuth(memo = "鐩樼偣")
public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
- mobileService.adjustNew(combParam, getUserId());
+ mobileService.adjustNew(combParam, Boolean.FALSE, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
-
+ @RequestMapping("/adjustNew/v2/auth")
+ @ManagerAuth(memo = "琛ヨ揣")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("琛ヨ揣鎴愬姛");
+ }
}
--
Gitblit v1.9.1