From d6258da9eb0203cbc812689197eb3d347799a8d0 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期六, 03 六月 2023 10:28:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 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..3c85513 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("姝ゆ墭鐩樼爜涓嶄负鎷f枡鍑哄簱");
+        if (Cools.isEmpty(wrkMast)) {
+            throw new CoolException(barcode + "鏆傛棤宸ヤ綔妗�");
+        }
+        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+            throw new CoolException(barcode + "涓嶄负鎷f枡/鐩樼偣鍑哄簱");
         }
         List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
         return R.ok().add(wrkDetls);
@@ -66,18 +69,18 @@
     @Transactional
     public R pikingToFull(String barcode) {
         WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
-        if (wrkMast.getIoType() != 103){
-            throw new CoolException(barcode + "涓嶄负鎷f枡鍑哄簱");
-        }
         if(Cools.isEmpty(wrkMast)){
             throw new CoolException("宸ヤ綔妗d笉鑳戒负绌�");
+        }
+        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+            throw new CoolException(barcode + "涓嶄负鎷f枡/鐩樼偣鍑哄簱");
         }
 
         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());
@@ -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