From 3f0fe86c814e65f09bfdf08923226ced9252a537 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 09 四月 2026 20:43:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index b88461a..31ba8b4 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -23,6 +23,8 @@
import com.zy.core.network.entity.ZyStationStatusEntity;
import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -153,6 +155,7 @@
boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, i * 10 + 7, 1);
statusEntity.setEnableIn(status2[1]);//鍚姩鍏ュ簱
statusEntity.setRunBlock(status2[2]);//閲嶆柊瑙勫垝璺嚎
+ statusEntity.setInBarcodeError(status2[3]);//鍏ュ簱鏉＄爜绔欏紓甯�
Integer palletHeight = null;
if (status[7]) {
@@ -197,7 +200,7 @@
continue;
}
double weight = (double) siemensNet.getByteTransform().TransSingle(result3.Content, i * 4);
- barcodeEntity.setWeight(weight);
+ barcodeEntity.setWeight(BigDecimal.valueOf(weight).setScale(2, RoundingMode.HALF_UP).doubleValue());
}
}
@@ -261,7 +264,6 @@
// 鍑哄叆搴撴ā寮�
OperateResultExOne<byte[]> result6 = siemensNet.Read("DB167.2", (short) (inStationOriginList.size() * 2));
if (result6.IsSuccess) {
- clearInStationIoModes();
for (int i = 0; i < inStationOriginList.size(); i++) {
ZyStationStatusEntity inStationEntity = findStatusEntityByInStationIdx(i);
if (inStationEntity == null) {
@@ -419,23 +421,6 @@
}
}
return null;
- }
-
- private void clearInStationIoModes() {
- if (inStationOriginList == null || statusList == null) {
- return;
- }
- for (StationObjModel stationObjModel : inStationOriginList) {
- if (stationObjModel == null || stationObjModel.getStationId() == null) {
- continue;
- }
- for (ZyStationStatusEntity statusEntity : statusList) {
- if (stationObjModel.getStationId().equals(statusEntity.getStationId())) {
- statusEntity.setIoMode(null);
- break;
- }
- }
- }
}
private int getTaskWriteIdx(int stationIdx, Integer taskWriteIdx) {
--
Gitblit v1.9.1