From 37ce77c4c32f62efa7edccaea8b28a624e87d2ad Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 23 九月 2025 08:54:31 +0800 Subject: [PATCH] 缓冲区功能调整 --- src/main/java/com/zy/asrs/entity/LocDetl.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index ba30f0f..c95626c 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -3,9 +3,13 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.asrs.service.BasProcessProceduresService; +import com.zy.asrs.service.BasQualityTestingService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.LocOwnerService; import com.zy.common.utils.Synchro; @@ -13,6 +17,7 @@ import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; import java.text.SimpleDateFormat; @@ -20,14 +25,27 @@ @Data @TableName("asr_loc_detl") +@Accessors(chain = true) @ExcelIgnoreUnannotated public class LocDetl implements Serializable { private static final long serialVersionUID = 1L; + @TableId + private Long id; + + @TableField("loc_id") + private Long locId; + @ApiModelProperty(value= "搴撲綅鍙�") @TableField("loc_no") private String locNo; + + @ApiModelProperty("area_id") + private Long areaId; + + @ApiModelProperty("area_name") + private String areaName; @ApiModelProperty(value= "鎵樼洏鏉$爜") private String zpallet; @@ -334,4 +352,22 @@ } } + public String getBoxType1$(){ + BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class); + BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1)); + if (!Cools.isEmpty(processProcedures)){ + return String.valueOf(processProcedures.getBoxSpecs()); + } + return this.boxType1; + } + + public String getBoxType2$(){ + BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class); + BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1)); + if (!Cools.isEmpty(basQualityTesting)){ + return String.valueOf(basQualityTesting.getBoxSpecs()); + } + return this.boxType1; + } + } -- Gitblit v1.9.1