From 3b17ccf3fd001cbec7a8bac368f07cd9237faae8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 27 十月 2025 12:54:36 +0800
Subject: [PATCH] 侧面出库完成上报执行状态替代plc码盘完成信号交互
---
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 4 ++--
src/main/webapp/views/taskWrk/taskWrk.html | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++-----
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 4 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 14 +++++++-------
5 files changed, 19 insertions(+), 18 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 8ed5dc1..2a5315b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -255,10 +255,10 @@
boolean offer = false;
try {
offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- staProtocol.setMp(taskWrk.getMp());
- staProtocol.setLx(taskWrk.getLx());
- staProtocol.setLev(taskWrk.getLev());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+// staProtocol.setMp(taskWrk.getMp());
+// staProtocol.setLx(taskWrk.getLx());
+// staProtocol.setLev(taskWrk.getLev());
+// MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
} catch (Exception e) {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
@@ -269,7 +269,8 @@
taskWrk.setWrkSts(14);
taskWrk.setCompleteTime(new Date());
taskWrkService.updateById(taskWrk);
-
+ // 渚ч潰鍑哄簱瀹屾垚 涓婃姤鎵ц鐘舵��
+ toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
} else {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
}
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 9e7992e..ae33dcd 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -86,8 +86,8 @@
add(301);add(302);add(303);add(304);add(305);add(306);add(307);add(308);
}};
- // 渚ч潰鐮佺洏瀹屾垚涓婃姤wms
- @Scheduled(cron = "0/3 * * * * ? ")
+ // 渚ч潰鐮佺洏瀹屾垚涓婃姤wms -寮冪敤锛屽嚭搴撳畬鎴愭椂鍊欎笂鎶ョ姸鎬�
+// @Scheduled(cron = "0/3 * * * * ? ")
public synchronized void reportPalletizingCompleted() {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
if (devpThread != null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 49fa23c..4bb7db6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -303,13 +303,13 @@
}
// 璇讳晶闈㈢爜鐩樺畬鎴愪俊鍙�
- OperateResultExOne<byte[]> resultMp = siemensS7Net.Read("DB79.362", (short) 4);
- if (resultMp.IsSuccess) {
- StaProtocol staProtocol207 = station.get(207);
- StaProtocol staProtocol212 = station.get(212);
- staProtocol207.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 0));
- staProtocol212.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 2));
- }
+// OperateResultExOne<byte[]> resultMp = siemensS7Net.Read("DB79.362", (short) 4);
+// if (resultMp.IsSuccess) {
+// StaProtocol staProtocol207 = station.get(207);
+// StaProtocol staProtocol212 = station.get(212);
+// staProtocol207.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 0));
+// staProtocol212.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 2));
+// }
// 璇诲彇姝ｉ潰鏉＄爜
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB103.0", (short) (5 * 40));
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 64a0031..d68f920 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -94,8 +94,8 @@
</el-table-column>
<el-table-column property="lev" label="鐮佺洏灞傛暟">
</el-table-column>
- <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">
- </el-table-column>
+<!-- <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">-->
+<!-- </el-table-column>-->
</el-table>
<div style="margin-top: 10px;">
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index f17f14e..63457ab 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -77,8 +77,8 @@
</el-table-column>
<el-table-column property="lev" label="鐮佺洏灞傛暟">
</el-table-column>
- <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">
- </el-table-column>
+<!-- <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">-->
+<!-- </el-table-column>-->
</el-table>
<div style="margin-top: 10px;">
--
Gitblit v1.9.1