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 | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 5380cd7..8207b1c 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -61,10 +61,10 @@
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){
+ 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));
+ 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涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
@@ -78,8 +78,11 @@
}
SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
singleMountUnstackingCompleteParam.setStaStart(staNo);
- singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
+ singleMountUnstackingCompleteParam.setStaEnd(staEnd);
ReturnT<String> result = null;
+ if (true){
+ return FAIL;
+ }
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
// if (true){
@@ -92,6 +95,8 @@
// wrkMast.setSheetNo("1");
// wrkMastService.updateById(wrkMast);
// basDevp.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// basDevpEnd.setReportSign(1);
// basDevpService.updateById(basDevp);
// return SUCCESS;
// }
@@ -106,6 +111,9 @@
wrkMastService.updateById(wrkMast);
basDevp.setReportSign(1);
basDevpService.updateById(basDevp);
+ basDevpEnd.setReportSign(1);
+ basDevpService.updateById(basDevpEnd);
+
return SUCCESS;
}else {
log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
--
Gitblit v1.9.1