From 728e14723ba5a26f95cf099cac3a0d1853aea34b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 六月 2025 10:46:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index 7097c7a..5c6a759 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -58,7 +58,6 @@
public ReturnT<String> start(int staNo,int staNoEnd) {
try {
- Integer staOther = getStaOther(staNoEnd);
BasDevp basDevp = basDevpService.selectById(staNo);
if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0
|| !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getLoadingSuper().equals("Y") || !basDevp.getInEnable().equals("Y")){
@@ -66,12 +65,12 @@
}
BasDevp basDevp131 = basDevpService.selectById(131);
if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y")
- || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000) || basDevp131.getReportSign()!=0){
+ || basDevp131.getWrkNo()!=0 || basDevp131.getReportSign()!=0){
return FAIL;
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
- if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
+ if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2 || wrkMast.getSheetNo().equals("3")){
return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -84,11 +83,7 @@
return FAIL;
}
BasDevp basDevpEnd = basDevpService.selectById(staNoEnd);
- if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 ){
- return FAIL;
- }
- BasDevp basDevpOther = basDevpService.selectById(staOther);
- if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()!=0){
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") ){
return FAIL;
}
--
Gitblit v1.9.1