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 | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4b8982b..ec47bd4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -53,8 +53,11 @@
@ManagerAuth
public R pikingAuth(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
- if (wrkMast.getIoType() != 103){
- throw new CoolException("姝ゆ墭鐩樼爜涓嶄负鎷ｆ枡鍑哄簱");
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(barcode + "鏆傛棤宸ヤ綔妗�");
+ }
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+ throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
@@ -76,8 +79,8 @@
Date now = new Date();
List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
wrkMast.setIoType(101);
- wrkMast.setSourceStaNo(wrkMast.getStaNo());
- wrkMast.setStaNo(200);
+// wrkMast.setSourceStaNo(wrkMast.getStaNo());
+// wrkMast.setStaNo(200);
wrkMastService.updateById(wrkMast);
wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
@@ -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){
@@ -364,10 +367,15 @@
@RequestMapping("/adjustNew/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjustNew(@RequestBody MobileAdjustParam combParam){
- mobileService.adjustNew(combParam, getUserId());
+ public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
+ 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