From 664df6de041aeab4341f739372f64ac9e428aad2 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 一月 2026 13:57:45 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 12 ++++++------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 28dbb84..d8c0989 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -940,11 +940,11 @@
throw new CoolException("鍗曟嵁涓嶅瓨鍦� 锛侊紒");
}
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,params.getSourceStaNo()).orderByDesc(DeviceSite::getId),false);
- if (Objects.isNull(deviceSite)) {
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, params.getSourceStaNo()).orderByDesc(BasStation::getId), false);
+ if (Objects.isNull(basStation)) {
throw new CoolException(params.getSourceStaNo()+"绔欑偣涓嶅瓨鍦紒锛�");
}
- if (deviceSite.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type.toString())) {
+ if (!basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
throw new CoolException(params.getSourceStaNo()+"绔欑偣闈炲厜鐢电珯鐐癸紒锛佽浣跨敤PDA缁戝畾鍏ュ簱");
}
Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
@@ -957,7 +957,7 @@
}
GenerateTaskParams taskParams = new GenerateTaskParams();
taskParams.setWaitPakins(waitPakins)
- .setSiteId(deviceSite.getId());
+ .setSiteId(basStation.getId());
R r = taskService.generateTasksWcs(taskParams, 111L,params.getRowList());//lsh寰呬慨鏀� WCS鐢ㄦ埛淇℃伅
if (r.get("msg").equals("浠诲姟鐢熸垚瀹屾瘯锛�")) {
one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index a40d434..45f807b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -509,11 +509,11 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- DeviceSite deviceSite = deviceSiteService.getById(waitPakin.getSiteId());
- if (Objects.isNull(deviceSite)) {
+ BasStation basStation = basStationService.getById(waitPakin.getSiteId());
+ if (Objects.isNull(basStation)) {
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(deviceSite.getSite()));
+ DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(basStation.getStationName()));
if (Cools.isEmpty(deviceBind)) {
throw new CoolException("搴撲綅瑙勫垯鏈煡");
}
@@ -534,8 +534,8 @@
//楠岃瘉鍩虹淇℃伅
- BasStation basStation = checkStaStatus(pakin.getBarcode(), deviceSite.getSite());
+ BasStation basStation1 = checkStaStatus(pakin.getBarcode(),basStation.getStationName());
// BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
// .eq(BasContainer::getCode, pakin.getBarcode()));
// if (Objects.isNull(container)) {
@@ -559,8 +559,8 @@
.setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val)
.setTargLoc(targetLoc)
.setBarcode(pakin.getBarcode())
- .setOrgSite(deviceSite.getSite())
- .setTargSite(deviceSite.getDeviceSite())
+ .setOrgSite(basStation.getStationName())
+ .setTargSite(basStation.getStationName())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
--
Gitblit v1.9.1