#

yxFwq

2024-11-19 dbc2514aad6b2b70b08e81f33d45f64aae175ccf

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

@@ -1,5 +1,6 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -29,13 +30,13 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 工作号
     */
    @ApiModelProperty(value= "工作号")
    @TableId(value = "wrk_no", type = IdType.INPUT)
    @TableField("wrk_no")
    private Long wrkNo;

@@ -143,7 +144,6 @@
     * 任务类型 0: 未知  1: 开门  2: 关门  3: 入硫化罐  4: 入冷却槽  5: 穿梭车进冷却槽  6: 穿梭车离开冷却槽  7: 出冷却槽  
     */
    @ApiModelProperty(value= "任务类型 0: 未知  1: 开门  2: 关门  3: 入硫化罐  4: 入冷却槽  5: 穿梭车进冷却槽  6: 穿梭车离开冷却槽  7: 出冷却槽  ")
    @TableId(value = "io_type", type = IdType.INPUT)
    @TableField("io_type")
    private Integer ioType;

@@ -181,6 +181,27 @@
        this.ioType = ioType;
        this.type = type;
        this.rgvEndId = rgvEndId;
    }

    public WrkMastExecuteLog(WrkMastExecute wrkMastExecute) {
        this.wrkNo = wrkMastExecute.getWrkNo();
        this.enterStaNo = wrkMastExecute.getEnterStaNo();
        this.outStaNo = wrkMastExecute.getOutStaNo();
        this.jarEnterStaNo = wrkMastExecute.getJarEnterStaNo();
        this.jarOutStaNo = wrkMastExecute.getJarOutStaNo();
        this.jarId = wrkMastExecute.getJarId();
        this.jarRegin = wrkMastExecute.getJarRegin();
        this.status = wrkMastExecute.getStatus();
        this.steId = wrkMastExecute.getSteId();
        this.rgvId = wrkMastExecute.getRgvId();
        this.ioTime = wrkMastExecute.getIoTime();
        this.modiTime = wrkMastExecute.getModiTime();
        this.appeTime = wrkMastExecute.getAppeTime();
        this.wrkType = wrkMastExecute.getWrkType();
        this.wrkSts = wrkMastExecute.getWrkSts();
        this.ioType = wrkMastExecute.getIoType();
        this.type = wrkMastExecute.getType();
        this.rgvEndId = wrkMastExecute.getRgvEndId();
    }

//    WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
@@ -240,33 +261,56 @@
    }

    public String getWrkSts$(){
        BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
        if (!Cools.isEmpty(basJarMastStatus)){
            return String.valueOf(basJarMastStatus.getId());
        try{
            if (Cools.isEmpty(this.wrkSts)){
                return this.wrkSts+"：未知";
            }
//            BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
////        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
//            BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
//            if (!Cools.isEmpty(basJarMastStatus)){
//                return String.valueOf(basJarMastStatus.getBoxSpecs());
//            }
            if (true){
                return this.wrkSts.toString();
            }
        } catch (Exception e){
            return this.wrkSts+"：未知==>异常："+e.getMessage();
        }
        return null;
        return this.wrkSts+"：未知";
    }

    //任务类型 0: 未知  1: 开进料门  2: 关进料门  3: 开出料门  4: 关出料门  5: 入硫化罐  6: 入冷却槽  7: 穿梭车进冷却槽  B=>C  8: 穿梭车离开冷却槽 C=>B  9: 出冷却槽 10：A=>B 11:B=>A

    public String getIoType$(){
        if (null == this.ioType){ return null; }
        if (null == this.ioType){ return "未知"; }
        switch (this.ioType){
            case 0:
                return "未知";
            case 1:
                return "开门";
                return "开进料门";
            case 2:
                return "关门";
                return "关进料门";
            case 3:
                return "入硫化罐";
                return "开出料门";
            case 4:
                return "入冷却槽";
                return "关出料门";
            case 5:
                return "穿梭车进冷却槽";
                return "入硫化罐";
            case 6:
                return "穿梭车离开冷却槽";
                return "入冷却槽";
            case 7:
                return "B=>C";
            case 8:
                return "C=>B";
            case 9:
                return "出冷却槽";
            case 10:
                return "A=>B";
            case 11:
                return "B=>A";
            case 100:
                return "充电任务";
            default:
                return String.valueOf(this.ioType);
        }