From 28b207e3da756dae0a987a392c09d8866f8ef4f9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 16:06:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/thread/ScaleThread.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 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 411e038..02db0a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -60,7 +60,7 @@
private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
private static final Integer jarMaxLoc = 7;
- private static final Float jarTemperature = 80F;
+ private static final Float jarTemperature = 50F;
@Autowired
private CommonService commonService;
@Autowired
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index bb1c616..3c574e5 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -51,7 +51,12 @@
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 (slave.getId()>3){
+ scale = scale - 50.8;
+ } else {
+ scale = scale - 67.6;
+ }
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
if(scale > 20) {
--
Gitblit v1.9.1