From ea12b685190254228d88a0de261b1e399fcbf15b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydwcs_cs20251105
---
src/main/java/com/zy/core/thread/ScaleThread.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 62c7ac2..e71448c 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -68,6 +68,9 @@
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, slave.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(slave.getStaNo());
if (staProtocol != null) {
+ if (scale>10000){
+ scale = scale-10000;
+ }
devpThread.setGrossWt(staProtocol.getSiteId(), scale);
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.9.1