# ycq 条码显示

luxiaotao1123

2022-03-10 3e266a267dcbbbf86e8b47eaf6abea449dc1cd04

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

@@ -595,6 +595,11 @@
                        moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
                    }
                    continue;
                } else if (shallowLoc.getLocSts().equals("Q")){
                    WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                    if (null != waitWrkMast && waitWrkMast.getWrkSts()==4) {
                        continue;
                    }
                }
            }

@@ -693,13 +698,17 @@
                        if (null == waitWrkMast) {
                            log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                        } else {
                            waitWrkMast.setIoPri(15D);
                            waitWrkMast.setModiTime(new Date());
                            if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                            if(waitWrkMast.getWrkSts() == 11) {
                                waitWrkMast.setIoPri(15D);
                                waitWrkMast.setModiTime(new Date());
                                if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                    log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                }
                                continue;
                            } else {

                            }
                        }
                        continue;
                    } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                        // 此标记避免多次执行移库任务
                        if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
@@ -1331,6 +1340,15 @@
        for (Integer row : rows) {
            if (Utils.isDeepLoc(slaveProperties, row)) {
                loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

                if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())){
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                    LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
                    if(!shallowLoc1.getLocSts().equals("O")){
                        loc = null;
                    }
                }

                if (null != loc) { break; }
            }
        }