*

lsh

2025-04-08 7c4fe5558d0d9a5ef9b7301d76269d02478e658c

*

 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());