From a0d7fdd303b3f76131d77162a7dd2c7db60d80ae Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 19:12:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 8207b1c..b24e75d 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -18,6 +18,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -49,6 +51,7 @@
public ReturnT<String> start(int staNo) {
try {
+ Date now = new Date();
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
@@ -61,7 +64,7 @@
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 || basDevpEnd.getReportSign()!=0){
+ 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).eq("wrk_sts",51L));
@@ -69,21 +72,36 @@
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")){
+ if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("0")){
return FAIL;
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
return FAIL;
}
- SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
+ List<WrkDetl> wrkDetlList = new ArrayList<>();
+ String signOne = "";
+ String signTwo = "";
+ for (WrkDetl wrkDetl:wrkDetls){
+ if (wrkDetl.getOrigin().equals("1") && signOne.equals("")){
+ wrkDetlList.add(wrkDetl);
+ signOne = "1";
+ } else if (wrkDetl.getOrigin().equals("2") && signTwo.equals("")){
+ wrkDetlList.add(wrkDetl);
+ signTwo = "2";
+ }
+ if (!signOne.equals("") && !signTwo.equals("")){
+ break;
+ }
+ }
+ SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetlList);
singleMountUnstackingCompleteParam.setStaStart(staNo);
singleMountUnstackingCompleteParam.setStaEnd(staEnd);
- ReturnT<String> result = null;
- if (true){
- return FAIL;
- }
- result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
+// result = null;
+// if (true){
+// return FAIL;
+// }
+ ReturnT<String> result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
// if (true){
// for (WrkDetl wrkDetl:wrkDetls){
@@ -101,10 +119,18 @@
// return SUCCESS;
// }
if (result.getCode()==200){
+ Date nowOne = new Date();
+ Date nowTwo = now;
for (WrkDetl wrkDetl:wrkDetls){
+ if (wrkDetl.getOrigin().equals("1")){
+ now = nowOne;
+ } else if (wrkDetl.getOrigin().equals("2")){
+ now = nowTwo;
+ }
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
wrkDetlSingle.sync(wrkDetl);
wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+ wrkDetlSingle.setIoTime(now);
wrkDetlSingleService.insert(wrkDetlSingle);
}
wrkMast.setSheetNo("1");
--
Gitblit v1.9.1