From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index f2ed2b9..96572a9 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -5,13 +5,17 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.LedErrorAreaType;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.escalationParam.StaEscalationParam;
+import com.zy.asrs.utils.LedErrorThreadUtil;
import com.zy.common.utils.HttpHandler;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -40,7 +44,7 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
- private StaDescService staDescService;
+ private RgvOneSignMapper rgvOneSignMapper;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -70,8 +74,8 @@
if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if (Cools.isEmpty(wrkMast)) return FAIL;
- if (wrkMast.getSheetNo().equals("2")) return FAIL;
- if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
+ if (wrkMast.getIoType()==1 || wrkMast.getIoType()==10) return FAIL;
+ if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo().equals("2")) return FAIL;
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
WrkDetl wrkDetl = null;
if (Cools.isEmpty(wrkDetls) || wrkDetls.isEmpty()){
@@ -95,6 +99,7 @@
staEscalationParam.setOrderNo(wrkDetl.getSpecs());
staEscalationParam.setTaskNo(wrkDetl.getModel());
staEscalationParam.setWeight(wrkDetl.getWeight());
+ staEscalationParam.setWrkno(Cools.isEmpty(wrkDetl.getWrkNo()) ? "0":wrkDetl.getWrkNo().toString());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
@@ -102,13 +107,40 @@
basDevp.setReportSign(1);
basDevpService.updateById(basDevp);
return SUCCESS;
- }else {
- log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶澶辫触");
+ } else {
+ LedErrorThreadUtil.ledErrorThread("缈昏浆涓婃姤erp澶辫触!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+ log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶澶辫触锛佺珯鐐瑰彿锛�"+staNo);
}
}
}
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ LedErrorThreadUtil.ledErrorThread("缈昏浆涓婁紶寮傚父!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+ log.error("寮傚父4锛侊紒锛�"+e);
+ return FAIL;
+ }
+ return FAIL;
+ }
+
+ public ReturnT<String> start2(int staNo) {
+ try{
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
+ if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
+ return FAIL;
+ }
+
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) {
+ return FAIL;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (!staProtocol.isLoading() && staProtocol.getWorkNo()!=0){
+ rgvOneSign.setRgvOneSign(0);
+ rgvOneSignMapper.updateById(rgvOneSign);
+ }
+ }catch (Exception e){
+ log.error("寮傚父3锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
--
Gitblit v1.9.1