From b1c9e5683cee961946e85297eb581f26cff694ef Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 09 四月 2026 15:00:07 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/WarehouseLocationRetrievalUtil.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/WarehouseLocationRetrievalUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/WarehouseLocationRetrievalUtil.java
index 1e52730..687c9c0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/WarehouseLocationRetrievalUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/WarehouseLocationRetrievalUtil.java
@@ -139,9 +139,9 @@
.eq(BasStation::getStationName, site).last("limit 1"));
if (!Cools.isEmpty(basStation)){
BasStationTypeService basStationTypeService = SpringUtils.getBean(BasStationTypeService.class);
- BasStationType one = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getContainerType()).last("limit 1"));
+ BasStationType one = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getStationTypeCode()).last("limit 1"));
if (!Cools.isEmpty(one)) {
- if (one.getTaskType().contains(type)){
+ if (one.getTaskType().contains("all") || one.getTaskType().contains(type)){
outboundSite.add(site);
}
}
@@ -407,16 +407,19 @@
}
}
BasStationTypeService basStationTypeService = SpringUtils.getBean(BasStationTypeService.class);
- BasStationType one = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getContainerType()).last("limit 1"));
- if (!Cools.isEmpty(one)) {
- if (one.getTaskType().contains(type)){
+ BasStationType stationType = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getStationTypeCode()).last("limit 1"));
+ if (!Cools.isEmpty(stationType)) {
+ if (stationType.getTaskType().contains("all")){
+ return true;
+ }
+ if (!Cools.isEmpty(stationType.getTaskType()) && stationType.getTaskType().contains(type)) {
return true;
}
log.error("鐩爣绔欑偣:" + targetCode+" 涓嶆敮鎸佷綔涓氭浠诲姟绫诲瀷锛�"+type);
}
- log.error("鐩爣绔欑偣:" + targetCode+" 涓嶆敮鎸佷綔涓氭浠诲姟绫诲瀷锛�"+type);
+ log.error("鐩爣绔欑偣:" + targetCode+" 鏈尮閰嶅埌绔欑偣绫诲瀷");
}
- log.error("queryPathIsItAvailableInArea: error");
+ log.error("queryPathIsItAvailableOutArea: error");
}
return false;
}
@@ -446,14 +449,17 @@
}
}
BasStationTypeService basStationTypeService = SpringUtils.getBean(BasStationTypeService.class);
- BasStationType one = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getContainerType()).last("limit 1"));
- if (!Cools.isEmpty(one)) {
- if (one.getTaskType().contains(type)){
+ BasStationType stationType = basStationTypeService.getOne(new LambdaQueryWrapper<BasStationType>().eq(BasStationType::getStationTypeCode, basStation.getStationTypeCode()).last("limit 1"));
+ if (!Cools.isEmpty(stationType)) {
+ if (stationType.getTaskType().contains("all")){
+ return true;
+ }
+ if (!Cools.isEmpty(stationType.getTaskType()) && stationType.getTaskType().contains(type)) {
return true;
}
log.error("褰撳墠绔欑偣:" + sourceCode+" 涓嶆敮鎸佷綔涓氭浠诲姟绫诲瀷锛�"+type);
}
- log.error("褰撳墠绔欑偣:" + sourceCode+" 涓嶆敮鎸佷綔涓氭浠诲姟绫诲瀷锛�"+type);
+ log.error("褰撳墠绔欑偣:" + sourceCode+" 鏈尮閰嶅埌绔欑偣绫诲瀷");
}
log.error("queryPathIsItAvailableInArea: error");
}
--
Gitblit v1.9.1