From 0e1b0582d0e59ce3a85ac59515a878a385adc507 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 16 十一月 2023 14:20:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 14f6ca0..a405a4a 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -71,6 +71,10 @@
             if (!Cools.isEmpty(locMasts)){
                 for (LocMast locMast:locMasts){
                     LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+                    if (Cools.isEmpty(locDetl)){
+                        log.error("娴嬭瘯澶辫触锛圢G锛夌Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�"+locMast.getLocNo());
+                        continue;
+                    }
                     TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                             .eq("loc_no",locMast.getLocNo())
                             .eq("barcode",locDetl.getMatnr())
@@ -106,9 +110,10 @@
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return FAIL.setMsg(e.getMessage());
+            log.error(""+e);
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return FAIL.setMsg(e.getMessage());
         }
 
         //娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�
@@ -123,6 +128,10 @@
             if (!Cools.isEmpty(locMasts2)){
                 for (LocMast locMast:locMasts2){
                     LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+                    if (Cools.isEmpty(locDetl)){
+                        log.error("娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�==>搴撳瓨鏄庣粏鏌ヨ澶辫触锛佸簱浣嶅彿锛�"+locMast.getLocNo());
+                        continue;
+                    }
                     TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                             .eq("loc_no",locMast.getLocNo())
                             .eq("barcode",locDetl.getMatnr())
@@ -190,9 +199,10 @@
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return FAIL.setMsg(e.getMessage());
+            log.error(""+e);
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return FAIL.setMsg(e.getMessage());
         }
 
         //娴嬭瘯鏈夌┖搴撲綅 绉诲簱
@@ -220,9 +230,10 @@
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return FAIL.setMsg(e.getMessage());
+            log.error(""+e);
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }

--
Gitblit v1.9.1