From 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 16:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 cf5f958..8207b1c 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -49,9 +49,6 @@
public ReturnT<String> start(int staNo) {
try {
- if(true){
- return FAIL;
- }
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
@@ -67,8 +64,8 @@
if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0 ) || basDevpEnd.getWrkNo()>10000 || basDevpEnd.getReportSign()!=0){
return FAIL;
}
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts()==51) return FAIL;
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd).eq("wrk_sts",51L));
+ 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()));
@@ -83,6 +80,9 @@
singleMountUnstackingCompleteParam.setStaStart(staNo);
singleMountUnstackingCompleteParam.setStaEnd(staEnd);
ReturnT<String> result = null;
+ if (true){
+ return FAIL;
+ }
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
// if (true){
@@ -112,7 +112,8 @@
basDevp.setReportSign(1);
basDevpService.updateById(basDevp);
basDevpEnd.setReportSign(1);
- basDevpService.updateById(basDevp);
+ basDevpService.updateById(basDevpEnd);
+
return SUCCESS;
}else {
log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
--
Gitblit v1.9.1