From e666ab89158593e0ab2e44d6e61a2a3a4f8210b2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 14:47:22 +0800
Subject: [PATCH] 随机可用堆垛机号
---
src/main/java/com/zy/asrs/controller/MobileController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b4e9b00..3c85513 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 + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
}
@@ -85,6 +88,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setModiTime(now);
+ wrkDetl.setMatType(locDetl.getMatType());
wrkDetl.sync(locDetl);
wrkDetlService.insert(wrkDetl);
@@ -238,6 +242,7 @@
wrkDetl.setOrderNo(orderNo);
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setWrkNo(wrkNo);
+ wrkDetl.setMatType(locDetl.getMatType());
return R.ok().add(wrkDetl);
}
}
@@ -345,7 +350,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 +369,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