From 8a9ec422a47325bcf35f802a31ca804533de96ff Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 22 十一月 2022 13:30:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 9466378..f35df86 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 (wrkMast.getIoType() != 103){
+ throw new CoolException("姝ゆ墭鐩樼爜涓嶄负鎷ｆ枡鍑哄簱");
+ }
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
}
@@ -88,14 +91,14 @@
}
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
- if (locMast.getLocSts().equals("S")) {
+ if (locMast.getLocSts().equals("P")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
}
-
+ locMastService.updateById(locMast);
return R.ok("杞崲鎴愬姛");
}
@@ -338,6 +341,17 @@
return R.ok();
}
+ @RequestMapping("/checkDetl/auth2")
+ @ManagerAuth
+ public R getCheckDetl2(String barcode) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (wrkMast.getIoType() != 107){
+ throw new CoolException("姝ゆ墭鐩樼爜涓嶄负鐩樼偣鍑哄簱");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ return R.ok().add(wrkDetls);
+ }
+
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
public R adjust(@RequestBody MobileAdjustParam combParam){
@@ -345,5 +359,12 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/adjustNew/auth")
+ @ManagerAuth(memo = "鐩樼偣")
+ public R adjustNew(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1