From 91917e48f87be1cecdb9e1235ff5a8678f50ec6d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 11 四月 2026 16:06:16 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
version/db/new.sql | 11 +++++++++++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java | 2 +-
zy-asc-conveyor/src/main/resources/application.yml | 2 ++
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 42 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index 6339ce1..bdffc86 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -108,3 +108,14 @@
alter table sys_user_login
change system system_name varchar(255) null comment '鐧诲綍绯荤粺';
+
+
+
+
+ALTER TABLE `man_func_sta`
+ ADD COLUMN `protocol` varchar(255) NULL COMMENT '鍗忚' AFTER `angle`,
+ADD COLUMN `ip` varchar(255) NULL COMMENT 'ip鍦板潃' AFTER `protocol`,
+ADD COLUMN `port` varchar(255) NULL COMMENT '绔彛鍙�' AFTER `ip`;
+
+ALTER TABLE `man_func_sta`
+ ADD COLUMN `error` varchar(255) NULL COMMENT '鏁呴殰淇℃伅' AFTER `port`;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
index 03bec89..ba2fb1d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/ManagerBoot.java
@@ -9,7 +9,7 @@
@MapperScan("com.zy.**.mapper")
@EnableDiscoveryClient
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.zy.acs.manager", "com.zy.acs.charge"})
@EnableScheduling
public class ManagerBoot {
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
index c1a30cc..9b1e241 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/DevpSlave.java
@@ -27,6 +27,8 @@
private List<Integer> barcodeArr = new ArrayList<>();
+ private List<Integer> weightArr = new ArrayList<>();
+
private List<Integer> staNos = new ArrayList<>();
private List<Integer> staNosError = new ArrayList<>();
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 0c9d2ee..370550e 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -17,6 +17,8 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -114,6 +116,9 @@
// 璇诲彇鏉＄爜
readBarcodes();
+ // 绉伴噸
+ readWeight();
+
// 璇诲彇澶栧舰妫�娴嬮敊璇�
readDimensionErrors();
@@ -175,9 +180,41 @@
if (!Cools.isEmpty(barcode)) {
StaProtocol staProtocol = station.get(barcodeArr.get(i));
+ if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), barcodeArr.get(i));
+ continue;
+ }
staProtocol.setBarcode(barcode);
News.info("鏂欑鐮侊細{}", barcode);
}
+ }
+ }
+
+ /**
+ * 璇诲彇鏉＄爜淇℃伅
+ */
+ private void readWeight() {
+ List<Integer> weightArr = slave.getWeightArr();
+ if (weightArr == null || weightArr.isEmpty()) {
+ return;
+ }
+
+ OperateResultExOne<byte[]> result = siemensS7Net.Read(
+ DeviceField.WEIGHT.buildAddress(),
+ (short) (weightArr.size() * DeviceField.WEIGHT.getByteLength()));
+
+ if (!result.IsSuccess) {
+ log.warn("璇诲彇閲嶉噺澶辫触 [id:{}]", slave.getId());
+ return;
+ }
+ for (int i = 0; i < weightArr.size(); i++) {
+ StaProtocol staProtocol = station.get(weightArr.get(i));
+ if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), weightArr.get(i));
+ continue;
+ }
+ double weight = siemensS7Net.getByteTransform().TransSingle(result.Content, i * DeviceField.WEIGHT.getByteLength());
+ staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
}
@@ -203,6 +240,10 @@
for (int i = 0; i < staNosError.size(); i++) {
Integer siteId = staNosError.get(i);
StaProtocol staProtocol = station.get(siteId);
+ if (staProtocol == null){
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNosError.get(i));
+ continue;
+ }
boolean[] status = siemensS7Net.getByteTransform().TransBool(
content, i * DeviceField.DIMENSION_WORD.getByteLength(),
@@ -236,6 +277,7 @@
Integer siteId = staNos.get(i);
StaProtocol staProtocol = station.get(siteId);
if (staProtocol == null) {
+ log.warn("绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), siteId);
continue;
}
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index c4f1655..5f095f5 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -106,6 +106,8 @@
- 1010
barcodeArr:
- 1010
+ weightArr:
+ - 1010
# ctu鏀捐揣绔欑偣
releaseSta[0]:
# 鏈珯鐐�
--
Gitblit v1.9.1