From 392aebed0af81c8369a3f07dfdc53cad1b59f6b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 16:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/java/com/zy/asrs/controller/MobileController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4acc3f0..ec47bd4 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 + "涓嶄负鎷f枡/鐩樼偣鍑哄簱");
         }
@@ -345,7 +348,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){

--
Gitblit v1.9.1