From e99b04d64836f02fbf05092d5a1a29a812f4cbc9 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 02 十一月 2024 10:19:09 +0800 Subject: [PATCH] 入库呼叫agv取货判断有无出库任务 --- src/main/java/com/zy/common/model/LocTypeDto.java | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index ccd52fc..d12b054 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -1,12 +1,15 @@ package com.zy.common.model; +import com.alibaba.fastjson.JSON; import com.core.exception.CoolException; -import com.zy.core.model.protocol.StaProtocol; +import com.zy.asrs.entity.BasDevp; import lombok.Data; +import lombok.extern.slf4j.Slf4j; /** * Created by vincent on 2020/10/19 */ +@Slf4j @Data public class LocTypeDto { @@ -22,31 +25,12 @@ public LocTypeDto() { } - public LocTypeDto(StaProtocol staProtocol) { - if (staProtocol.isHigh() == staProtocol.isLow()) { + public LocTypeDto(BasDevp basDevp) { + if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) { throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); } - if (staProtocol.isLow()) { - this.locType1 = 1; // 浣庡簱浣� - } else { - this.locType1 = 2; // 楂樺簱浣� - } - } - - /** - * 搴撲綅绫诲瀷瑙f瀽 - */ - public static LocTypeDto process(StaProtocol staProtocol) { - LocTypeDto dto = new LocTypeDto(); - if (staProtocol.isHigh() == staProtocol.isLow()) { - throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); - } - if (staProtocol.isLow()) { - dto.setLocType1((short) 1); // 浣庡簱浣� - } else { - dto.setLocType1((short) 2); // 楂樺簱浣� - } - return dto; + this.locType1 = basDevp.getLocType1(); + log.info(JSON.toJSONString(this)); } } -- Gitblit v1.9.1