From d3f3d4b309cfb285fcbbc48b91c4046111c7e9cd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 02 七月 2025 13:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 71 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 28 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 7aca912..7f2d211 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
@@ -318,7 +319,6 @@
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
- @Async
public void crnStnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
@@ -354,23 +354,28 @@
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- //鍙栧嚭杈撻�佺嚎鍛戒护
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- if (commandInfos.isEmpty()) {
- continue;//鍛戒护绌�
- }
+ try {
+ //鍙栧嚭杈撻�佺嚎鍛戒护
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+ if (commandInfos.isEmpty()) {
+ continue;//鍛戒护绌�
+ }
// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
- Integer commandStep = taskWrk.getCommandStep();
- CommandInfo commandInfo = commandInfos.get(commandStep);
- CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
- //StaProtocol staProtocol1 = JSON.parseObject(commandInfo.getCommand(), StaProtocol.class);
- StaProtocol staProtocol1 = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
- if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol1))) {
- log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
- continue;//鍛戒护涓嬪彂澶辫触
+ Integer commandStep = taskWrk.getCommandStep();
+ CommandInfo commandInfo = commandInfos.get(commandStep);
+ CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
+ //StaProtocol staProtocol1 = JSON.parseObject(commandInfo.getCommand(), StaProtocol.class);
+ StaProtocol staProtocol1 = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
+ if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol1))) {
+ log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
+ continue;//鍛戒护涓嬪彂澶辫触
+ }
+ }catch (Exception e){
+ throw new CoolException("鍙栧嚭杈撻�佺嚎鍛戒护澶辫触");
}
+
// 澶嶄綅鍫嗗灈鏈�
crnThread.setResetFlag(true);
@@ -513,15 +518,20 @@
if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
} else {
- //寮�濮嬭繍琛�
- String response = CrnStartRunning(taskWrk);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ try {
+ //寮�濮嬭繍琛�
+ String response = CrnStartRunning(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
- }else {
- log.error("鍏ュ簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+ }else {
+ log.error("鍏ュ簱寮�濮嬭繍琛寃ms鎶ラ敊,"+jsonObject.get("msg"));
+ }
+ }catch (Exception e) {
+ log.error("鍏ュ簱寮�濮嬭繍琛寃ms鎶ラ敊");
}
+
}
// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -688,15 +698,20 @@
}else {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓紒锛侊紝宸ヤ綔鍙�={}", taskWrk.getWrkNo());
}
- //寮�濮嬭繍琛�
- String response = CrnStartRunning(taskWrk);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ try {
+ //寮�濮嬭繍琛�
+ String response = CrnStartRunning(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
- }else {
- log.error("鍑哄簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+ }else {
+ log.error("鍑哄簱寮�濮嬭繍琛寃ms澶辫触,"+jsonObject.get("msg"));
+ }
+ }catch (Exception e){
+ log.error("鍑哄簱寮�濮嬭繍琛寃ms澶辫触,");
}
+
}
}
@@ -835,7 +850,7 @@
/**
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
- @Async
+
public void storeFinished() {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -939,7 +954,7 @@
/**
* 鍫嗗灈鏈哄紓甯镐俊鎭褰�
*/
- @Async
+
public void recCrnErr(){
Date now = new Date();
for (CrnSlave crn : slaveProperties.getCrn()) {
--
Gitblit v1.9.1