| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) { |
|---|
| | | WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo); |
|---|
| | | // WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo); |
|---|
| | | WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo); |
|---|
| | | // 此标记避免多次执行移库任务 |
|---|
| | | if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk()) |
|---|
| | | || Cools.isEmpty(waitWrkMast)) { |
|---|
| | | // if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk()) |
|---|
| | | // || Cools.isEmpty(waitWrkMast)) { |
|---|
| | | if (Cools.isEmpty(waitWrkMast)) { |
|---|
| | | wrkMast.setUpdMk("Y"); |
|---|
| | | wrkMastMapper.updateById(wrkMast); |
|---|
| | | // 生成工作档,将浅库位移转到新的库位中 |
|---|
| | | moveLocForDeepLoc(slave, shallowLoc); |
|---|
| | | } |
|---|
| | | log.error("{}任务出库失败，浅库位堵塞！", wrkMast.getWrkNo()); |
|---|
| | | log.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(),shallowLocNo); |
|---|
| | | continue; |
|---|
| | | } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")){ |
|---|
| | | WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo); |
|---|
