From cc3126c2512a3ab541ce6a067267eabdc56b58a3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 10:36:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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..bc4acfb 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 && wrkMast.getIoType() != 107){
+ throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
+ }
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
}
@@ -63,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());
@@ -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,20 @@
return R.ok();
}
+ @RequestMapping("/checkDetl/auth2")
+ @ManagerAuth
+ public R getCheckDetl2(String barcode) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if(Cools.isEmpty()){
+ throw new CoolException("姝ゆ墭鐩樼爜娌℃湁鐩樼偣浠诲姟");
+ }
+ 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 +362,12 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/adjustNew/auth")
+ @ManagerAuth(memo = "鐩樼偣")
+ public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1