缓冲区功能调整

skyouc

昨天 37ce77c4c32f62efa7edccaea8b28a624e87d2ad

 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;
@@ -169,19 +187,40 @@
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1;
    private String standby1 = "";

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

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String 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";

    /**
     * 是否冻结
@@ -302,15 +341,33 @@
    }

    public String getFrozen$() {
        if (null == this.frozen){ return null; }
        if (null == this.frozen){ return "未冻结"; }
        switch (this.frozen){
            case 0:
                return "未冻结";
            case 1:
                return "已冻结";
            default:
                return null;
                return "未冻结";
        }
    }

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

}