From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 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 bb752c3..894a7c1 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -43,6 +43,8 @@
private CommonService commonService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@Value("${channel.equipmentRow}")
private Integer equipmentRow; //娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
@@ -69,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())
@@ -104,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());
}
//娴嬭瘯鎴愬姛 鍑哄簱銆佺Щ搴�
@@ -121,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())
@@ -129,10 +140,20 @@
boolean sign=false;
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
+ boolean signCrn1 = basCrnpService.checkSiteError(1, false);
+ if (!signCrn1){
+ log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍑哄簱!");
+ break;
+ }
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
LocMast targetLocNo = locMastService.queryFreeLocMast(4,(short)2);
if (Cools.isEmpty(targetLocNo)){
targetLocNo=locMastService.queryFreeLocMast(3,(short)2);
+ }
+ boolean signCrn2 = basCrnpService.checkSiteError(2, true);
+ if (!signCrn2){
+ targetLocNo = null;
+ log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->2鍙峰爢鍨涙満涓嶅彲鍏ュ簱! 寮�濮嬫煡鎵�1鍙峰爢鍨涙満");
}
if (targetLocNo != null){
//鐢熸垚鍑哄簱浠诲姟
@@ -140,6 +161,11 @@
sign=true;
}
}else {
+ signCrn1 = basCrnpService.checkSiteError(1, true);
+ if (!signCrn1){
+ log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍏ュ簱!");
+ break;
+ }
//3\4鎺掓弧 鍚�2鎺掔Щ搴擄紝鏌ヨ鐩爣搴撲綅
targetLocNo = locMastService.queryFreeLocMast(2,(short)2);
if (Cools.isEmpty(targetLocNo)){
@@ -173,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());
}
//娴嬭瘯鏈夌┖搴撲綅 绉诲簱
@@ -185,9 +212,15 @@
.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){
+ boolean signCrn1 = basCrnpService.checkSiteError(1, true);
+ if (!signCrn1){
+ log.error("鍚戞祴璇曞簱浣嶇Щ搴撳け璐�---->1鍙峰爢鍨涙満涓嶅彲鐢�!");
+ break;
+ }
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow,(short)1);
if (targetLocNo != null){
@@ -198,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;
}
@@ -261,14 +295,6 @@
locMast.setLocSts("R");
locMast.setModiTime(now);
// locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
-
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getMatnr());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(locMast.getPackStatus());
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
if (!locMastService.updateById(locMast)) {
log.error("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
return false;
--
Gitblit v1.9.1