From 326630a071e80c841a7eedb8850267269fb9efe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 22:10:55 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++----
src/main/java/com/zy/core/MainProcess.java | 12 +++++++++++-
src/main/java/com/zy/core/enums/IoModeType.java | 8 +++-----
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 6 +++++-
4 files changed, 21 insertions(+), 11 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 906941c..203e0fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2116,11 +2116,9 @@
if (pakout != null) {
if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf2_5 = IoModeType.PAKOUT_BOOTING;
WrkMast pakin = wrkMastService.selectWorkingPakin(1032);
- if (pakin == null && !devpThread.getStation().get(1032).isLoading()
- && !devpThread.getStation().get(1032).isLoading()
- && devpThread.getStation().get(1032).getWorkNo() == 0) {
+ if (pakin == null && !devpThread.getStation().get(1031).isLoading()
+ && !devpThread.getStation().get(1032).isLoading()) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2_5 = IoModeType.PAKOUT_MODE;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2df2426..0693bb1 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -48,6 +48,8 @@
// 鍏ュ簱
mainService.generateInboundWrk();
mainService.noLiftIn();
+ // 闂撮殧
+ Thread.sleep(100);
// 鍑哄簱
mainService.outFirst();
mainService.stnToOutStn();//杈撻�佺嚎
@@ -61,10 +63,16 @@
// mainService.shuttleOutExecute();
//鎻愬崌鏈哄叆搴撲换鍔�
mainService.liftInExecute();
+ // 闂撮殧
+ Thread.sleep(100);
//鎻愬崌鏈哄嚭搴撲换鍔�
mainService.liftOutExecute();
+ // 闂撮殧
+ Thread.sleep(100);
//鍥涘悜绌挎杞︿换鍔″畬鎴�
mainService.shuttleFinished();
+ // 闂撮殧
+ Thread.sleep(100);
//鎵ц绉诲簱浠诲姟
mainService.shuttleLocMoveExecute();
// //璐у弶鎻愬崌鏈轰换鍔�
@@ -75,6 +83,8 @@
// mainService.liftIoExecute();
//鎻愬崌鏈轰换鍔″畬鎴�
mainService.liftFinished();
+ // 闂撮殧
+ Thread.sleep(100);
//鎵ц灏忚溅绉诲姩浠诲姟
mainService.shuttleMoveExecute();
// 寮傚父淇℃伅璁板綍
@@ -91,7 +101,7 @@
}
// 闂撮殧
- Thread.sleep(200);
+ Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/zy/core/enums/IoModeType.java b/src/main/java/com/zy/core/enums/IoModeType.java
index 6fe2be5..a436825 100644
--- a/src/main/java/com/zy/core/enums/IoModeType.java
+++ b/src/main/java/com/zy/core/enums/IoModeType.java
@@ -5,11 +5,9 @@
*/
public enum IoModeType {
- NONE((short) 0, "鏈煡"),
- PAKIN_BOOTING((short) 1, "鍏ュ簱鍚姩涓�"),
- PAKIN_MODE((short) 2, "鍏ュ簱妯″紡"),
- PAKOUT_BOOTING((short) 3, "鍑哄簱鍚姩涓�"),
- PAKOUT_MODE((short) 4, "鍑哄簱妯″紡"),
+ NONE((short) 2, "鏈煡"),
+ PAKIN_MODE((short) 0, "鍏ュ簱妯″紡"),
+ PAKOUT_MODE((short) 1, "鍑哄簱妯″紡"),
;
public Short id;
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index b2499cd..efed1ca 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -136,6 +136,8 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
+ // 鏇存柊鍏ュ嚭搴撴ā寮�
+ updateIoMode();
int staNoSize = staNos2.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB82.14", (short) (staNoSize * 26));
if (result.IsSuccess) {
@@ -299,8 +301,10 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
private void updateIoMode() throws InterruptedException {
- if (slave.getId() == 1 && this.ioModeOf2_5 != null) {
+ if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
+ station.get(1031).setOutInModel(this.ioModeOf2_5.id);
+ station.get(1032).setOutInModel(this.ioModeOf2_5.id);
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
}
--
Gitblit v1.9.1