From 8b8854ce1a52bb74604271b29fa9e1ea7cbcde10 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 14 一月 2024 16:22:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index 42dbd76..5380cd7 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -52,22 +52,29 @@
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
- if (staOther==0) return SUCCESS;
+ if (staOther==0) return FAIL;
BasDevp basDevpOther = basDevpService.selectById(staOther);
if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
- return SUCCESS;
+ return FAIL;
+ }
+ BasDevp basDevpEnd = basDevpService.selectById(staEnd);
+ if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
+ return FAIL;
+ }
+ if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0) || basDevpEnd.getWrkNo()>10000){
+ return FAIL;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1)) return SUCCESS;
+ if (!Cools.isEmpty(wrkMast1)) return FAIL;
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast) || !wrkMast.getSheetNo().equals("0")){
- return SUCCESS;
+ return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
- return SUCCESS;
+ return FAIL;
}
SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
singleMountUnstackingCompleteParam.setStaStart(staNo);
--
Gitblit v1.9.1