From ac6bb34756815cceea18ae27dbec3e404bcdf69b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 九月 2024 14:01:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
index 2084791..bdd3464 100644
--- a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -6,8 +6,10 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
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;
@@ -45,6 +47,8 @@
private ApiLogService apiLogService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private RgvOneSignMapper rgvOneSignMapper;
// @Value("${srHangJia.url}")
private String erpUrl = "10.10.11.100:8580";
@@ -57,7 +61,7 @@
if (Cools.isEmpty(basDevp) || basDevp.getReportSign()==1){
return FAIL;
}
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocol = devpThread.getStation().get(staNo);
if (staProtocol == null) {
return FAIL;
@@ -68,7 +72,7 @@
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){
if (staProtocol.isAutoing() && staProtocol.getWorkNo()==0 && staProtocol.isInEnable()){
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犳椂锛岀珯鐐圭姸鎬侊細"+JSON.toJSONString(staProtocol));
- ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt());
+ ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt(),basDevp.getDevNo());
ReturnT<String> result = postMesData(reportOutPath,scaleEscalationParam);
if (result.getCode()==200){
basDevp.setReportSign(1);
@@ -78,6 +82,30 @@
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犲け璐�");
}
}
+ }
+ }catch (Exception e){
+ log.error("寮傚父锛侊紒锛�"+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()){
+ rgvOneSign.setRgvOneSign(0);
+ rgvOneSignMapper.updateById(rgvOneSign);
}
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
@@ -98,7 +126,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("Code")==200) {
+ if (jsonObject.getInteger("code")==200) {
success = true;
} else {
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犺姹傛帴鍙ｅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
--
Gitblit v1.9.1