From 497366bb6b6075ba8fc8af43322f38c5d6697e5f Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 30 七月 2025 08:05:04 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java index d8c7306..91f4e6f 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java @@ -7,6 +7,8 @@ import com.core.common.SpringUtils; import com.zy.asrs.service.BasProcessProceduresService; import com.zy.asrs.service.BasQualityTestingService; +import com.zy.asrs.service.KcztMapService; +import com.zy.asrs.service.StoreTypeService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -178,21 +180,31 @@ */ @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 = ""; + + /** + * 閫�搴撴爣璁� + */ + @ApiModelProperty(value= "閫�搴撴爣璁�") + @TableField("tk_flag") + private String tkFlag = ""; + + //搴撳瓨鐘舵�� + private String cstateid; public String getBeBatch$(){ if (null == this.beBatch){ return null; } @@ -218,6 +230,15 @@ default: return String.valueOf(this.source); } + } + + 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 getInspect$(){ @@ -276,4 +297,13 @@ return this.boxType1; } + public String getCstateid$() { + KcztMapService service = SpringUtils.getBean(KcztMapService.class); + KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid)); + if (!Cools.isEmpty(kcztMap)){ + return String.valueOf(kcztMap.getVname()); + } + return this.cstateid; + } + } -- Gitblit v1.9.1