From 0f63aed901976866810908b6c993feb688c48101 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 二月 2023 13:32:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 b1ff82b..14ca97b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1974,15 +1974,15 @@
devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE;
}
break;
- case 106: // 1F2
+ case 104: // 1F2
if (pakout != null) {
if (devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F2 = IoModeType.PAKOUT_MODE;
}
@@ -1992,15 +1992,15 @@
devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
}
break;
- case 112: // 1F3
+ case 111: // 1F3
if (pakout != null) {
if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F3 = IoModeType.PAKOUT_MODE;
}
@@ -2010,15 +2010,15 @@
devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
}
break;
- case 116: // 1F4
+ case 114: // 1F4
if (pakout != null) {
if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf1F4 = IoModeType.PAKOUT_MODE;
}
@@ -2028,15 +2028,15 @@
devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
}
break;
- case 202: // 2F1
+ case 201: // 2F1
if (pakout != null) {
if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2F1 = IoModeType.PAKOUT_MODE;
}
@@ -2046,15 +2046,15 @@
devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
}
break;
- case 205: // 2F2
+ case 203: // 2F2
if (pakout != null) {
if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2F2 = IoModeType.PAKOUT_MODE;
}
@@ -2064,15 +2064,15 @@
devpThread.ioModeOf2F2 = IoModeType.PAKIN_MODE;
}
break;
- case 302: // 3F1
+ case 301: // 3F1
if (pakout != null) {
if (devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf3F1 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf3F1 = IoModeType.PAKOUT_MODE;
}
@@ -2082,15 +2082,15 @@
devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
}
break;
- case 305: // 3F2
+ case 303: // 3F2
if (pakout != null) {
if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
devpThread.ioModeOf3F2 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() + 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() + 1).getWorkNo() == 0) {
+ && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
+ && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
// 鍑哄簱妯″紡
devpThread.ioModeOf3F2 = IoModeType.PAKOUT_MODE;
}
--
Gitblit v1.9.1