#

luxiaotao1123

2020-08-15 0157c39c88d79ea85b584f47570bab6bc0c2cdc5

#

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -203,21 +203,32 @@

    @PostMapping("/crn/detail")
    @ManagerAuth(memo = "堆垛机设备数据详情")
    public R crnDetail(@RequestParam String crnNo){
    public R crnDetail(@RequestParam Integer crnNo){
        if (Cools.isEmpty(crnNo)){
            return R.parse(CodeRes.EMPTY);
        }
        CrnDetailVo vo = new CrnDetailVo();
        vo.setCrnNo(crnNo);
        vo.setWorkNo("3387");
        vo.setSourceStaNo("2303");
        vo.setStaNo("2410");
        vo.setWorkStatus("3.吊车入库中");
        vo.setIoType("1.入库");
        vo.setSourceStock("");
        vo.setStock("05050040");
        vo.setCrnStatus("取货中");
        vo.setError("0");
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
                vo.setWorkNo(crnProtocol.getTaskNo());
                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                        vo.setStaNo(wrkMast.getStaNo$());
                        vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                        vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                        vo.setLocNo(wrkMast.getLocNo$());
                        vo.setCrnStatus(crnProtocol.getStatusType().desc);
                        vo.setError("");    // todo
                    }
                }
            }
        }
        return R.ok().add(vo);
    }


 src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java

@@ -1,118 +1,42 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

/**
 * 堆垛机详情视图对象
 * Created by vincent on 2020-06-03
 */
@Data
public class CrnDetailVo {

    // 堆垛机号
    private String crnNo;
    private Integer crnNo;

    // 工作号
    private String workNo;
    private Short workNo;

    // 源站
    private String sourceStaNo;
    private String sourceStaNo = "";

    // 目标站
    private String staNo;
    private String staNo = "";

    // 工作状态
    private String workStatus;
    private String wrkSts = "";

    // 出入类型
    private String ioType;
    private String ioType = "";

    // 源库位
    private String sourceStock;
    private String sourceLocNo = "";

    // 目标库位
    private String stock;
    private String locNo = "";

    // 堆垛机状态
    private String crnStatus;
    private String crnStatus = "";

    // 异常
    private String error;
    private String error = "";

    public String getCrnNo() {
        return crnNo;
    }

    public void setCrnNo(String crnNo) {
        this.crnNo = crnNo;
    }

    public String getWorkNo() {
        return workNo;
    }

    public void setWorkNo(String workNo) {
        this.workNo = workNo;
    }

    public String getSourceStaNo() {
        return sourceStaNo;
    }

    public void setSourceStaNo(String sourceStaNo) {
        this.sourceStaNo = sourceStaNo;
    }

    public String getStaNo() {
        return staNo;
    }

    public void setStaNo(String staNo) {
        this.staNo = staNo;
    }

    public String getWorkStatus() {
        return workStatus;
    }

    public void setWorkStatus(String workStatus) {
        this.workStatus = workStatus;
    }

    public String getIoType() {
        return ioType;
    }

    public void setIoType(String ioType) {
        this.ioType = ioType;
    }

    public String getSourceStock() {
        return sourceStock;
    }

    public void setSourceStock(String sourceStock) {
        this.sourceStock = sourceStock;
    }

    public String getStock() {
        return stock;
    }

    public void setStock(String stock) {
        this.stock = stock;
    }

    public String getCrnStatus() {
        return crnStatus;
    }

    public void setCrnStatus(String crnStatus) {
        this.crnStatus = crnStatus;
    }

    public String getError() {
        return error;
    }

    public void setError(String error) {
        this.error = error;
    }
}

 src/main/java/com/zy/core/enums/CrnStatusType.java

@@ -2,24 +2,23 @@

public enum CrnStatusType {

    IDLE(0),   // 空闲
    FETCH_POSITION(1),  // 取货定位中
//    FETCH_REQUEST(2),   // 取货请求
    FETCHING(2),     // 取货中
    PUT_POSITION(3),   // 放货定位中
//    PUT_REQUEST(5),    // 放货请求
    PUTTING(4),     //放货中
    TO_ORIGIN(5),      // 回原点中
    ORIGIN(6),        // 反原点
    LOC_MOVE(7),      // 库位移位
    WAITING(90),    // 任务完成等待WCS确认
//    REPAIR(98),     // 维修
    SOS(99),    // 报警
    IDLE(0, "空闲"),
    FETCH_POSITION(1, "取货定位中"),
    FETCHING(2, "取货中"),
    PUT_POSITION(3, "放货定位中"),
    PUTTING(4, "放货中"),
    TO_ORIGIN(5, "回原点中"),
    ORIGIN(6, "反原点"),
    LOC_MOVE(7, "库位移位"),
    WAITING(90, "任务完成等待WCS确认"),
    SOS(99, "报警"),
    ;

    public Integer id;
    CrnStatusType(Integer id) {
    public String desc;
    CrnStatusType(Integer id, String desc) {
        this.id = id;
        this.desc = desc;
    }

    public static CrnStatusType get(Short id) {

 src/main/webapp/views/console.html

@@ -341,7 +341,7 @@
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
@@ -359,7 +359,7 @@
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
@@ -367,7 +367,7 @@
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
                <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>