#

lsh

3 天以前 0d8fcb1505ba869290cce9099b42370e4333b708

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1561,7 +1561,15 @@
     */
    public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
        Double pri = 0.0;
        for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast.getIoType() != 110){
                if (wrkMast.getIoPri()>=pri){
                    pri = wrkMast.getIoPri();
                } else {
                    continue;
                }
            }
            if (wrkMast == null) {
                continue;
            }
@@ -1640,7 +1648,11 @@
                            log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                        } else {
                            if (waitWrkMast.getWrkSts() == 11) {
                                waitWrkMast.setIoPri(15D);
                                if (waitWrkMast.getIoPri() + 100000D < 99999999) {
                                    waitWrkMast.setIoPri(waitWrkMast.getIoPri()+100000D);
                                } else {
                                    waitWrkMast.setIoPri(99999999D);
                                }
                                waitWrkMast.setModiTime(new Date());
                                if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                    log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
@@ -1676,6 +1688,9 @@
                        if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
                            continue;
                        }
                    } else if (!shallowLoc.getLocSts().equals("O") ){
                        log.error("{}任务出库失败，浅库位堵塞！浅库位号:{},浅库位状态:{}", wrkMast.getWrkNo(), shallowLocNo,shallowLoc.getLocSts());
                        continue;
                    }
                }