From 0abb8fc8c901a9aedf70c7c0e5bb86dbd2bd4031 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 11 一月 2023 13:45:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++--------
1 files changed, 8 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 f92ca5a..bc4acfb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -53,8 +53,8 @@
@ManagerAuth
public R pikingAuth(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
- if (wrkMast.getIoType() != 103){
- throw new CoolException("姝ゆ墭鐩樼爜涓嶄负鎷ｆ枡鍑哄簱");
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+ throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
@@ -66,18 +66,18 @@
@Transactional
public R pikingToFull(String barcode) {
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
- if (wrkMast.getIoType() != 103){
- throw new CoolException(barcode + "涓嶄负鎷ｆ枡鍑哄簱");
- }
if(Cools.isEmpty(wrkMast)){
throw new CoolException("宸ヤ綔妗ｄ笉鑳戒负绌�");
+ }
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+ throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
}
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());
@@ -364,7 +364,7 @@
@RequestMapping("/adjustNew/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjustNew(@RequestBody MobileAdjustParam combParam){
+ public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
mobileService.adjustNew(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
--
Gitblit v1.9.1