From 94dba00dbc6f351f5835d6f4a98d3126cedd9e80 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 01 十一月 2022 17:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 43b1323..f35df86 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -48,6 +48,60 @@
@Autowired
private PackService packService;
+ // 鎷ｆ枡妫�绱㈡墭鐩樹俊鎭�
+ @RequestMapping("/piking/auth")
+ @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);
+ }
+
+ // 鎷ｆ枡杞叏鏉�
+ @RequestMapping("/piking/to/full")
+ @ManagerAuth
+ @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("宸ヤ綔妗ｄ笉鑳戒负绌�");
+ }
+
+ Date now = new Date();
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+ wrkMast.setIoType(101);
+ wrkMast.setSourceStaNo(wrkMast.getStaNo());
+ wrkMast.setStaNo(200);
+ wrkMastService.updateById(wrkMast);
+
+ wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
+ for(LocDetl locDetl : locDetls){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setModiTime(now);
+
+ wrkDetl.sync(locDetl);
+ wrkDetlService.insert(wrkDetl);
+ }
+
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("R");
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ }
+ locMastService.updateById(locMast);
+ return R.ok("杞崲鎴愬姛");
+ }
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
/**
@@ -287,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){
@@ -294,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