From 880b14b0be176882182f8d48cd8f5e80c1d9febe Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 23 十月 2023 14:03:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 77d1e17..f7a36fe 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; //娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
@@ -76,6 +78,16 @@
);
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)){
@@ -129,10 +141,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 +162,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)){
@@ -188,6 +215,11 @@
);
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){
--
Gitblit v1.9.1