From 3c8343535bec2a53855956e25598e2271fc84c0d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 07 七月 2024 10:28:21 +0800
Subject: [PATCH] 更新测试管理搜索功能
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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 f7a36fe..894a7c1 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())
@@ -78,16 +82,6 @@
);
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
- boolean signCrn1 = basCrnpService.checkSiteError(1, false);
- if (!signCrn1){
- log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍑哄簱!");
- break;
- }
- boolean signCrn2 = basCrnpService.checkSiteError(2, true);
- if (!signCrn2){
- log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->2鍙峰爢鍨涙満涓嶅彲鐢�!");
- break;
- }
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
LocMast targetLocNo = locMastService.queryFreeLocMast(2,(short)4);
if (Cools.isEmpty(targetLocNo)){
@@ -116,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());
}
//娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�
@@ -133,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())
@@ -200,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());
}
//娴嬭瘯鏈夌┖搴撲綅 绉诲簱
@@ -212,6 +212,7 @@
.eq("pack_status", 0)
.eq("loc_type1", (short) 3)
.eq("fire_status",0)
+ .orderBy("io_time",true)
);
if (!Cools.isEmpty(locMasts3)){
for (LocMast locMast:locMasts3){
@@ -230,9 +231,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