From c1bcfc1aa6c526e78de533d50cbe0c2f87bc8158 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 24 二月 2025 18:36:08 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 40d6c8c..a6dcf96 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -11,6 +11,8 @@
import com.zy.asrs.service.BasDevpPositionService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.escalationParam.RgvTaskReportingParam;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.SortTheExecutionOfTheCarUtil;
import com.zy.asrs.utils.TimeCalculatorUtils;
import com.zy.common.CodeRes;
@@ -121,7 +123,7 @@
log.info("鏇存柊灏忚溅鎺掑簭淇℃伅寮傚父={}", rgvNo);
return;
}
- List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<BasCircularShuttle>().orderBy("rgv_id", true));
+ List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<BasCircularShuttle>().eq("status", 0).orderBy("rgv_id", true));
if (basCircularShuttleList.get(0).getRgvNo().equals(rgvNo)) {
return;
}
@@ -161,6 +163,10 @@
Integer rgvNo = 0;
List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<BasCircularShuttle>().orderBy("rgv_id", true));
for (BasCircularShuttle basCircularShuttle : basCircularShuttleList) {
+ if (basCircularShuttle.getStatus() != 0){
+ sign = true;
+ continue;
+ }
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
@@ -271,6 +277,9 @@
break runRgv;
}
BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
+ if (basCircularShuttle.getStatus() != 0){
+ continue ;
+ }
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
@@ -370,7 +379,24 @@
break;
}
wrkMast.setWrkSts(3L);
- wrkMast.setAppeTime(new Date());
+ Date now = new Date();
+ wrkMast.setAppeTime(now);
+ try{
+ try{
+ RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataWcs("", "", rgvTaskReportingParam);
+ if (result.getCode()==200){
+ wrkMast.setWrkSts(4L);
+ wrkMast.setAppeTime(now);
+ wrkMastService.updateById(wrkMast);
+ continue;
+ }else {
+ log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触");
+ }
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"浠诲姟瀹屾垚淇℃伅涓婁紶澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ } catch (Exception e){}
wrkMastService.updateById(wrkMast);
}
}
--
Gitblit v1.9.1