From 852a6cc97fadbcc5538d14e2667ddb663767e7aa Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期二, 01 七月 2025 16:52:53 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++++++++ src/main/java/com/zy/core/thread/ScaleThread.java | 3 +++ 2 files changed, 13 insertions(+), 0 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 b4aaf6b..93b0d30 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1893,6 +1893,15 @@ if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){ // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢 if (!staProtocol.isLoading()) { + devpThread.setErrorDev(staProtocol.getSiteId(), "鏃犵墿"); + return null; + } + if (!staProtocol.isInEnable()) { + devpThread.setErrorDev(staProtocol.getSiteId(), "绛夊緟鍙叆淇″彿"); + return null; + } + if (!staProtocol.isStaOk()) { + devpThread.setErrorDev(staProtocol.getSiteId(), "绛夊緟閾炬潯灏辩华"); return null; } // 灏哄妫�娴嬪紓甯� @@ -1978,6 +1987,7 @@ } return null; } + return null; } return taskWrk; } 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