From a636a6b7d53860c3b5ff5832c68c03a1fab79ac8 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期四, 11 四月 2024 16:39:49 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 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 16ea668..309c69e 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 @@ -7,8 +7,12 @@ import com.zy.asrs.wcs.common.domain.enums.DictType; import com.zy.asrs.wcs.core.map.controller.param.MapDataParam; import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam; +import com.zy.asrs.wcs.core.map.controller.result.LiftVo; import com.zy.asrs.wcs.core.map.controller.result.LocVo; +import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo; import com.zy.asrs.wcs.core.utils.Utils; +import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol; +import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol; import com.zy.asrs.wcs.system.entity.Dict; import com.zy.asrs.wcs.system.service.DictService; import com.zy.asrs.wcs.system.service.UserService; @@ -91,6 +95,48 @@ return locVos; } + public ShuttleVo getShuttleInfo(String shuttleNo) { + ShuttleVo vo = new ShuttleVo(); + vo.setShuttleNo(shuttleNo); + ShuttleProtocol protocol = new ShuttleProtocol(); + // todo checkout protocol +// vo.setTaskNo(String.valueOf(protocol.getTaskNo())); +// vo.setStatus(protocol.getProtocolStatusType().desc); +// vo.setOriginLocNo(protocol.getSourceLocNo()); +// vo.setDestLocNo(protocol.getLocNo()); +// vo.setCurrentCode(protocol.getCurrentCode()); +// vo.setBatteryPower(protocol.getBatteryPower()); +// vo.setErrorCode(protocol.getErrorCode()); +// vo.setBatteryTemp(protocol.getBatteryTemp()); +// vo.setHasLift(protocol.getHasLift()); +// vo.setHasPallet(protocol.getHasPallet()); +// vo.setHasCharge(protocol.getHasCharge()); +// vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage())); +// vo.setPakMk(protocol.getPakMk()); + return vo; + } + + public LiftVo getLiftInfo(String liftNo) { + LiftVo vo = new LiftVo(); + vo.setLiftNo(liftNo); + LiftProtocol protocol = new LiftProtocol(); + // todo checkout protocol +// vo.setTaskNo(String.valueOf(protocol.getTaskNo())); +// vo.setStatus(protocol.getProtocolStatusType().desc); +// vo.setOriginLocNo(protocol.getSourceLocNo()); +// vo.setDestLocNo(protocol.getLocNo()); +// vo.setCurrentCode(protocol.getCurrentCode()); +// vo.setBatteryPower(protocol.getBatteryPower()); +// vo.setErrorCode(protocol.getErrorCode()); +// vo.setBatteryTemp(protocol.getBatteryTemp()); +// vo.setHasLift(protocol.getHasLift()); +// vo.setHasPallet(protocol.getHasPallet()); +// vo.setHasCharge(protocol.getHasCharge()); +// vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage())); +// vo.setPakMk(protocol.getPakMk()); + return vo; + } + private String getMapKey(Integer floor) { if (null != floor) { return "map-" + floor; -- Gitblit v1.9.1