From a4fdbb852841fcc9bcc78676e4551efcff384494 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期六, 08 六月 2024 11:17:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 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 854bb0b..64ccc7f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -6236,14 +6236,14 @@
/**
* 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
*/
- public synchronized void crnIoExecuteTwoExecute() {
+ public synchronized void crnIoExecuteTwoExecute(Integer i) {
for (CrnSlave crn : slaveProperties.getCrn()) {
try{
switch (crn.getId()){
case 3:
case 4:
case 5:
- crnWrkMastSplitTwinExecute(crn);
+ crnWrkMastSplitTwinExecute(crn,i);
continue;
default:
continue;
@@ -6255,7 +6255,7 @@
}
- public synchronized boolean crnWrkMastSplitTwinExecute(CrnSlave crn){
+ public synchronized boolean crnWrkMastSplitTwinExecute(CrnSlave crn,Integer i){
try{
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -6274,30 +6274,44 @@
// 鍙湁褰撳爢鍨涙満鑷姩鏃舵墠缁х画鎵ц
if (crnProtocol.getModeType() == CrnModeType.AUTO) {
// 鍙湁褰撳爢鍨涙満宸ヤ綅1鍙栬揣鎴栬�呮湁鐗� 骞朵笖 宸ヤ綅2鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE
- && crnProtocol.getTaskNo() == 0
- && crnProtocol.getLoaded() == 0
- && crnProtocol.getForkPos() == 0) {
- sign[0] = 1;
- sign[1] = 1;
- } else if (crnProtocol.getStatusType() == CrnStatusType.SEPARATE_IDLE
- && crnProtocol.getTaskNo() == 0
- && crnProtocol.getLoaded() == 1
- && crnProtocol.getForkPos() == 0) {
- sign[0] = 2;
- sign[1] = 1;
- } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
- && crnProtocol.getTaskNoTwo() == 0
- && crnProtocol.getLoadedTwo() == 0
- && crnProtocol.getForkPosTwo() == 0){
- sign[0] = 1;
- sign[1] = 2;
- } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.SEPARATE_IDLE
- && crnProtocol.getTaskNoTwo() == 0
- && crnProtocol.getLoadedTwo() == 1
- && crnProtocol.getForkPosTwo() == 0){
- sign[0] = 2;
- sign[1] = 2;
+ switch (i){
+ case 1:
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE
+ && crnProtocol.getTaskNo() == 0
+ && crnProtocol.getLoaded() == 0
+ && crnProtocol.getForkPos() == 0) {
+ sign[0] = 1;
+ sign[1] = 1;
+ }
+ break;
+ case 2:
+ if (crnProtocol.getStatusType() == CrnStatusType.SEPARATE_IDLE
+ && crnProtocol.getTaskNo() == 0
+ && crnProtocol.getLoaded() == 1
+ && crnProtocol.getForkPos() == 0) {
+ sign[0] = 2;
+ sign[1] = 1;
+ }
+ break;
+ case 3:
+ if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
+ && crnProtocol.getTaskNoTwo() == 0
+ && crnProtocol.getLoadedTwo() == 0
+ && crnProtocol.getForkPosTwo() == 0){
+ sign[0] = 1;
+ sign[1] = 2;
+ }
+ break;
+ case 4:
+ if (crnProtocol.getStatusTypeTwo() == CrnStatusType.SEPARATE_IDLE
+ && crnProtocol.getTaskNoTwo() == 0
+ && crnProtocol.getLoadedTwo() == 1
+ && crnProtocol.getForkPosTwo() == 0){
+ sign[0] = 2;
+ sign[1] = 2;
+ }
+ break;
+ default:
}
}
--
Gitblit v1.9.1