From 8887422e04d93e8ab4b6d9a5c071eb6c64778995 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 13:34:36 +0800
Subject: [PATCH] 光电站点改为智能站点
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index 53cf813..9a4f334 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -141,7 +141,7 @@
for (BasContainer container : containers) {
String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
- List<Integer> areaList2 = container.getAreas();
+ List<Integer> areaList2 = container.getAreasIds();
if (!areaList2.contains(Integer.parseInt(area))) {
matches2 = false;
continue;
@@ -230,10 +230,15 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
}
- BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
- String stationName = stationCode.getStationName();
- if (Cools.isEmpty(stationCode)) {
+ String stationName = null;
+ if (Cools.isEmpty(deviceSite.getDeviceCode())) {
stationName = station.getStationName();
+ } else {
+ BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
+ stationName = stationCode.getStationName();
+ if (Cools.isEmpty(stationCode)) {
+ stationName = station.getStationName();
+ }
}
Task task = new Task();
task.setTaskCode(ruleCode)
--
Gitblit v1.9.1