#

18516761980

2021-09-09 16ff02f8884e858d4ed590390d8b64fc7acd4f5a

#

 src/main/java/com/zy/common/model/LocTypeDto.java

New file
@@ -0,0 +1,54 @@
package com.zy.common.model;

import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import lombok.Data;

/**
 * Created by vincent on 2020/10/19
 */
@Data
public class LocTypeDto {

    // 高低类型{0:未知,1:低库位,2:高库位}
    private Short locType1;

    // 宽窄类型{0:未知,1:窄库位,2:宽库位}
    private Short locType2;

    // 轻重类型{0:未知,1:轻库位,2:重库位}
    private Short locType3;

    public LocTypeDto() {
    }

    public LocTypeDto(BasDevp basDevp) {
        if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
            throw new CoolException("plc高低检测异常");
        }
        if (basDevp.getLocType1() == 1) {
            this.locType1 = 1; // 低库位
        } else if (basDevp.getLocType1() == 2){
            this.locType1 = 2; // 中库位
        } else {
            this.locType1 = 3; // 高库位
        }
//        if (basDevp.getLocType2() == 0) {
//            throw new CoolException("plc宽窄检测异常");
//        }
//        if (basDevp.getLocType2() == 1) {
//            this.locType2 = 1; // 窄库位
//        } else {
//            this.locType2 = 2; // 宽库位
//        }
//        if (basDevp.getLocType3() == 0) {
//            throw new CoolException("plc轻重检测异常");
//        }
//        if (basDevp.getLocType3() == 1) {
//            this.locType3 = 1; // 轻库位
//        } else {
//            this.locType3 = 2; // 重库位
//        }
    }

}

 src/main/java/com/zy/common/model/StartupDto.java

@@ -13,6 +13,8 @@

    private String locNo;

    private Integer workNo;

    public Integer getSourceStaNo() {
        return sourceStaNo;
    }
@@ -44,4 +46,12 @@
    public void setLocNo(String locNo) {
        this.locNo = locNo;
    }

    public Integer getWorkNo() {
        return workNo;
    }

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

 src/main/java/com/zy/common/web/WcsController.java

@@ -97,7 +97,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatNo).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(null, 1, devpNo, matNos, locTypeDto);
        int workNo = dto.getWorkNo();