From 6c23a18df04c565dcbed018e717c72419f79c2b8 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 21:47:54 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 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 9ff1800..7dd60f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2111,31 +2111,23 @@
public synchronized void ioConvert() {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
-
- FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta());
- switch (inSta.getBackSta()) {
- case 116:
- if (pakout != null) {
- if (devpThread.ioModeOf1F1 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
- && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf1F1 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE;
- }
- break;
-
+ FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ WrkMast pakout = wrkMastMapper.selectWorkingPakout(1032);
+ if (pakout != null) {
+ if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
+ // 鍑哄簱鍒囨崲涓�
+ devpThread.ioModeOf2_5 = IoModeType.PAKOUT_BOOTING;
+ WrkMast pakin = wrkMastMapper.selectWorkingPakin(1032);
+ if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
+ && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
+ && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
+ // 鍑哄簱妯″紡
+ devpThread.ioModeOf2_5 = IoModeType.PAKOUT_MODE;
+ }
}
+ } else {
+ // 鍏ュ簱妯″紡
+ devpThread.ioModeOf2_5 = IoModeType.PAKIN_MODE;
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1