From a5e366c9143ff99bc5f707048a73f93a8d444bb8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 16:23:32 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/ScaleThread.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index bb1c616..70c4978 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -51,10 +51,33 @@
                     if (!Cools.isEmpty(s) && s.startsWith("=")) {
                         String substring = s.substring(1);
                         String s1 = new StringBuilder(substring).reverse().toString();
-                        scale = Double.parseDouble(s1);
+                        scale = Double.parseDouble(s1);//50.8    67.6
+                        if (scale>60){
+                            switch (slave.getId()){
+                                case 1:
+                                    scale = scale - 60;
+                                    break;
+                                case 2:
+                                    scale = scale - 52;
+                                    break;
+                                case 3:
+                                    scale = scale - 74.0;
+                                    break;
+                                case 4:
+                                    scale = scale - 50.8;
+                                    break;
+                                default:
+                                    scale = scale - 74.0;
+                            }
+                        }
+//                        if (slave.getId()>3){
+//                            scale = scale - 50.8;
+//                        } else {
+//                            scale = scale - 74.0;
+//                        }
 
                         //灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
-                        if(scale > 20) {
+                        if(scale > 5) {
                             BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                             BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
                             if(!Cools.isEmpty(basDevp)) {

--
Gitblit v1.9.1