*

lsh

9 天以前 a1c4d0ef7980d9af390ab238041db0a8966f1881

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -2,7 +2,11 @@

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.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -155,19 +159,40 @@
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private Integer standby1;
    private String standby1 = "";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private Integer standby2;
    private String standby2 = "";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private Integer standby3;
    private String standby3 = "";

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    @TableField("box_type1")
    private String boxType1 = "1";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    @TableField("box_type2")
    private String boxType2 = "1";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    @TableField("box_type3")
    private String boxType3 = "1";

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
@@ -233,4 +258,22 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    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;
    }

}