From da8a535959c72cf61cf904f3dffaa1d0bd33b79f Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 11 七月 2025 10:43:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/LocDetl.java | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 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..c5d09b4 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -4,10 +4,10 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotations.TableField; 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.LocMastService; -import com.zy.asrs.service.LocOwnerService; +import com.zy.asrs.service.*; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -188,21 +188,21 @@ */ @ApiModelProperty(value= "澶囩敤1") @TableField("box_type1") - private String boxType1 = "1"; + private String boxType1 = ""; /** * 澶囩敤2 */ @ApiModelProperty(value= "澶囩敤2") @TableField("box_type2") - private String boxType2 = "1"; + private String boxType2 = ""; /** * 澶囩敤3 */ @ApiModelProperty(value= "澶囩敤3") @TableField("box_type3") - private String boxType3 = "1"; + private String boxType3 = ""; /** * 鏄惁鍐荤粨 @@ -334,4 +334,31 @@ } } + public String getStandby1$() { + StoreTypeService service = SpringUtils.getBean(StoreTypeService.class); + StoreType storeType = service.selectById(this.standby1); + if (!Cools.isEmpty(storeType)) { + return String.valueOf(storeType.getStoreName()); + } + return null; + } + + 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