From 7e68f7b8bf6c67be60faeac758511650c61c6f6d Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 29 十二月 2023 15:30:56 +0800 Subject: [PATCH] # --- zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java index d67b2b1..0ba8265 100644 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java @@ -1,6 +1,12 @@ package com.zy.asrs.common.domain.dto; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zy.asrs.common.wms.entity.LocDetl; +import com.zy.asrs.common.wms.service.LocDetlService; +import com.zy.asrs.framework.common.SpringUtils; import lombok.Data; + +import java.util.List; /** * Created by vincent on 2021/3/25 @@ -8,20 +14,57 @@ @Data public class SafeStoDo { - private Long node_id; + private Long id; - private String node_name; + private String locNo; private String matnr; private String maktx; - private Double safe_qua; + private Double safeQua; - private Double amount; + private Long hostId; - private String progress; + public String getLocNo$() { + if (this.locNo == null) { + return "鍏ㄩ儴"; + } + return this.locNo; + } - private Integer status; + public Double getAmount() { + Double sum = 0.0; + LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class); + LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getMatnr, this.matnr).eq(LocDetl::getHostId, this.hostId); + if (this.locNo != null) { + wrapper.eq(LocDetl::getLocNo, this.locNo); + } + List<LocDetl> list = locDetlService.list(wrapper); + for (LocDetl locDetl : list) { + sum += locDetl.getAnfme(); + } + return sum; + } + + public Integer getStatus() { + Integer status = 1; + Double amount = getAmount(); + double percent = amount / safeQua; + if (percent >= 1) { + status = 1;//婊′粨 + } else if (percent >= 0.75) { + status = 2;//瀹夊叏 + }else { + status = 3;//鍗遍櫓 + } + return status; + } + + public String getProgress() { + Double amount = getAmount(); + double percent = (amount / safeQua) * 100; + return String.valueOf(percent) + "%"; + } } -- Gitblit v1.9.1