From 4b97844365fddeeb66a00f4ac42389cadb545bcf Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 06 一月 2026 09:02:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java | 6 +++
src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java | 2 +
src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java | 6 +++
src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java | 2 +
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 48 +++++++++++++----------
5 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
index f2ecb14..e8b5eb6 100644
--- a/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/DualCrnProtocol.java
@@ -189,6 +189,12 @@
*/
public Integer yDuration;
+ //璐х墿绫诲瀷
+ private Integer goodsType;
+
+ //鏉＄爜
+ private String barcode;
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
diff --git a/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java b/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java
index d30c6b1..33f12eb 100644
--- a/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java
+++ b/src/main/java/com/zy/core/network/entity/ZyDualCrnStatusEntity.java
@@ -139,4 +139,10 @@
private Integer temp4;
+ //璐х墿绫诲瀷
+ private Integer goodsType;
+
+ //鏉＄爜
+ private String barcode;
+
}
diff --git a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
index 2d3b82e..e4762c6 100644
--- a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
@@ -64,31 +64,37 @@
//宸ヤ綅1
crnStatus.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, 2));
crnStatus.setStatus((int) siemensNet.getByteTransform().TransInt16(result.Content, 4));
- crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
- crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnStatus.setForkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnStatus.setLoaded((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 10));
//宸ヤ綅2
- crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnStatus.setTaskNoTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnStatus.setStatusTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnStatus.setForkPosTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnStatus.setLoadedTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnStatus.setTaskReceiveTwo((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 6));
- crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
- crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 18));
- crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
- crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnStatus.setBay((int) siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnStatus.setLevel((int) siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnStatus.setLiftPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnStatus.setWalkPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+ crnStatus.setAlarm((int) siemensNet.getByteTransform().TransInt16(result.Content, 30));
+ crnStatus.setTemp1((int) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+ crnStatus.setTemp2((int) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+ crnStatus.setTemp3((int) siemensNet.getByteTransform().TransInt16(result.Content, 38));
+ crnStatus.setTemp4((int) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnStatus.setXSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 42));
+ crnStatus.setYSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnStatus.setZSpeed((int) siemensNet.getByteTransform().TransInt16(result.Content, 46));
+ crnStatus.setXDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 48));
+ crnStatus.setYDistance((int) siemensNet.getByteTransform().TransInt16(result.Content, 50));
+ crnStatus.setXDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnStatus.setYDuration((int) siemensNet.getByteTransform().TransInt16(result.Content, 54));
+ crnStatus.setGoodsType((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
+ String barcode = siemensNet.getByteTransform().TransString(result.Content, 58, 8, "UTF-8");
+ crnStatus.setBarcode(barcode);
return crnStatus;
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧弻宸ヤ綅鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
index 43f5039..2af45a2 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java
@@ -308,6 +308,8 @@
crnProtocol.setYDistance(crnStatus.getYDistance());
crnProtocol.setXDuration(crnStatus.getXDuration());
crnProtocol.setYDuration(crnStatus.getYDuration());
+ crnProtocol.setGoodsType(crnStatus.getGoodsType());
+ crnProtocol.setBarcode(crnStatus.getBarcode());
OutputQueue.DUAL_CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
diff --git a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
index 29f07c5..983b5db 100644
--- a/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java
@@ -683,6 +683,7 @@
if (dualCrnProtocol.getTaskNo() == 0
&& dualCrnProtocol.getLoaded() == 0
&& dualCrnProtocol.getStatusType().equals(DualCrnStatusType.IDLE)
+ && dualCrnProtocol.getTaskReceive() == 0
) {
idleStationList.add(1);
}
@@ -690,6 +691,7 @@
if (dualCrnProtocol.getTaskNoTwo() == 0
&& dualCrnProtocol.getLoadedTwo() == 0
&& dualCrnProtocol.getStatusTypeTwo().equals(DualCrnStatusType.IDLE)
+ && dualCrnProtocol.getTaskReceiveTwo() == 0
) {
idleStationList.add(2);
}
--
Gitblit v1.9.1