From 5936220e860f561ff100a9eef4fbd5471c195946 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 08 九月 2025 17:14:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/domain/param/TaskDto.java | 2 +
src/main/java/com/zy/asrs/controller/OpenController.java | 26 +++++++++++-
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 30 ++++++++-------
src/main/java/com/zy/core/CtuMainProcess.java | 9 ++--
src/main/webapp/views/pipeline.html | 2
5 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7a62014..fc003ee 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,8 +6,11 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.impl.CtuMainServiceImpl;
import com.zy.common.web.BaseController;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
@@ -18,6 +21,8 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.Map;
+import java.util.Random;
/**
* Created by vincent on 2022/4/8
@@ -79,12 +84,26 @@
if (param == null || param.getSeqNum() == null || param.getQrCode() == null) {
return R.error("鍙傛暟涓虹┖");
}
- if (param.getQrCode().equals("00001547") && param.getTaskSts() == 10) {
+ if ((param.getQrCode().equals("00001547") || param.getQrCode().equals("1001")) && param.getTaskSts() == 10) {
log.info("1001浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
- ctuMainService.setFlag1001(true);
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+ StaProtocol staProtocol = station.get(1001);
+ if (staProtocol == null) {
+ return R.error("鏈壘鍒扮珯鐐�");
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Random rand = new Random();
+ staProtocol.setWorkNo(rand.nextInt(1000));
+ staProtocol.setStaNo((short) 1004);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ if (result) {
+ log.info("涓嬪彂鎴愬姛锛歿},{}", staProtocol.getWorkNo(), 1004);
+ }
} else if (param.getQrCode().equals("00001612") && param.getTaskSts() == 5) {
log.info("1007浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
- ctuMainService.setFlag1007(true);
+
}
return R.ok();
}
@@ -94,6 +113,7 @@
*/
@RequestMapping("/sta/ask/v1")
public R taskSync(@RequestBody AskStaParam param) {
+ log.info("鐘舵�佽闂細{}", param);
if (param == null || param.getAskSta() == null || param.getAskType() == null) {
return R.error("鍙傛暟涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/domain/param/TaskDto.java b/src/main/java/com/zy/asrs/domain/param/TaskDto.java
index 7a30eb9..7760666 100644
--- a/src/main/java/com/zy/asrs/domain/param/TaskDto.java
+++ b/src/main/java/com/zy/asrs/domain/param/TaskDto.java
@@ -10,6 +10,8 @@
private String seqNum;
+ private String memo;
+
private String oriLoc;
private String oriSta;
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index e26b268..ef92490 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -148,7 +148,7 @@
if (flag1007 && staProtocol.getWorkNo() > 0 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && staProtocol.isPakMk()) {
staProtocol.setWorkNo(0);
staProtocol.setStaNo((short) 0);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
log.info("鍙栬蛋鍐欏叆纭浣嶏細{},{}", staProtocol.getWorkNo(), 1007);
}
}
@@ -174,7 +174,7 @@
continue;
}
//&& staProtocol.isOutEnable()
- if (flag1001 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999) && staProtocol.isPakMk()) {
+ if (staProtocol.isAutoing() && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999) && staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
// 鍒ゆ柇閲嶅宸ヤ綔妗�
// 106涔熺畻涓婏紝浠ュ悗106-銆�107鐢ㄤ簬鏇存柊搴撳瓨
@@ -192,6 +192,11 @@
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.info("杈撻�佺嚎涓嬪彂3锛歿},{}", staProtocol.getWorkNo(), 1004);
if (result) {
+ try {
+ Thread.sleep(8000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
setFlag1001(false);
} else {
News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
@@ -297,12 +302,13 @@
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1001);
- if (i >= 7) {
+ if (i >= 6) {
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum(Math.random() * 1000 + "");
+ Random rand = new Random();
+ taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000);
taskDto.setOriLoc(getFLoc("1001", "16"));
taskDto.setDestSta("1001");
taskDto.setPriority(123);
@@ -332,25 +338,21 @@
if (!staProtocol.isLoading()) {
return;
}
- if (staProtocol.getStaNo() > 0) {
+ if (staProtocol.getStaNo() <= 0) {
return;
}
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum(Math.random() * 1000 + "");
+ taskDto.setSeqNum("SSX-RK" + staProtocol.getWorkNo());
taskDto.setDestLoc(getFLoc("1007", "15"));
- taskDto.setOriLoc("1007");
+ taskDto.setOriSta("1007");
taskDto.setPriority(123);
taskList.add(taskDto);
openBusSubmitParam.setTaskList(taskList);
- if (sendTask(openBusSubmitParam, staProtocol)) {
- staProtocol.setWorkNo(0);
- staProtocol.setStaNo((short) 0);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
- log.info("涓嬪彂缁檙cs鎴愬姛锛歿},{}", 0, 0);
- }
+ sendTask(openBusSubmitParam, staProtocol);
+
}
@@ -388,7 +390,7 @@
throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊");
}
} catch (Exception e) {
- log.error("fail", e);
+ //log.error("fail", e);
}
return false;
}
diff --git a/src/main/java/com/zy/core/CtuMainProcess.java b/src/main/java/com/zy/core/CtuMainProcess.java
index 9f5819d..358c875 100644
--- a/src/main/java/com/zy/core/CtuMainProcess.java
+++ b/src/main/java/com/zy/core/CtuMainProcess.java
@@ -47,20 +47,21 @@
ctuMainService.generateStoreWrkFile(1);
// 鍑哄簱
- ctuMainService.out(2);
+ //ctuMainService.out(2);
// 灏忚溅鍙栧畬璐э紝閫氱煡plc
- ctuMainService.outToPlc(6);
+ //ctuMainService.outToPlc(6);
// 101-108鎸夐挳鍏ュ簱
ctuMainService.in(3);
+
//1001鑷姩鍑�
- //ctuMainService.autoOut(4);
+ ctuMainService.autoOut(4);
//1007鑷姩鍏�
- //ctuMainService.autoIn(5);
+ ctuMainService.autoIn(5);
//ctuMainService.updateSta(6);
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..9facb87 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -432,7 +432,7 @@
});
$(document).on('click ','#save', function () {
- http.post(baseUrl+ "/site//detl/update", {
+ http.post(baseUrl+ "/site/detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
staNo: $('#staNo').val(),
--
Gitblit v1.9.1