From cab87dcfaa7b1e2bc1298572b775026bb17ef38b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:54:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index 7e2468d..66c59da 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -155,8 +155,7 @@
}
}
-
- public List<LocVo> getShelfLocNoList(String locNo) {
+ public List<LocVo> getShelfLocNoGroup(String locNo) {
List<LocVo> locVos = new ArrayList<>();
int row = Utils.getRow(locNo);
int bay = Utils.getBay(locNo);
@@ -172,12 +171,26 @@
return locVos;
}
+ public LocVo getShelfLocNoInfo(String locNo) {
+ LocVo locVo = new LocVo();
+ locVo.setLocNo(locNo);
+ Loc loc = locService.selectByLocNo(locNo);
+ if (null == loc) {
+ return locVo;
+ }
+ locVo.setLocSts(loc.getLocStsFlag());
+ locVo.setZpallet(loc.getZpallet());
+ locVo.setEnable(CommonUtils.getStatusBool(loc.getStatus()));
+ return locVo;
+ }
+
public ShuttleVo getShuttleInfo(String shuttleNo) {
ShuttleVo vo = new ShuttleVo();
vo.setShuttleNo(shuttleNo);
Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
.eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
.eq(Device::getDeviceNo, shuttleNo)
+ .eq(Device::getStatus, 1)
);
if (null == device) {
return vo;
--
Gitblit v1.9.1