From 5110b6563db73a2869e0ac09e717928289cdfdde Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 09:45:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 613d2ed..cf5f958 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -49,6 +49,9 @@
public ReturnT<String> start(int staNo) {
try {
+ if(true){
+ return FAIL;
+ }
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
@@ -65,7 +68,7 @@
return FAIL;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1)) return FAIL;
+ if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts()==51) 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()));
@@ -82,21 +85,21 @@
ReturnT<String> result = null;
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
- if (true){
- for (WrkDetl wrkDetl:wrkDetls){
- WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
- wrkDetlSingle.sync(wrkDetl);
- wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
- wrkDetlSingleService.insert(wrkDetlSingle);
- }
- wrkMast.setSheetNo("1");
- wrkMastService.updateById(wrkMast);
- basDevp.setReportSign(1);
- basDevpService.updateById(basDevp);
- basDevpEnd.setReportSign(1);
- basDevpService.updateById(basDevp);
- return SUCCESS;
- }
+// if (true){
+// for (WrkDetl wrkDetl:wrkDetls){
+// WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+// wrkDetlSingle.sync(wrkDetl);
+// wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+// wrkDetlSingleService.insert(wrkDetlSingle);
+// }
+// wrkMast.setSheetNo("1");
+// wrkMastService.updateById(wrkMast);
+// basDevp.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// basDevpEnd.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// return SUCCESS;
+// }
if (result.getCode()==200){
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
--
Gitblit v1.9.1