#

zjj

2024-03-15 dbae31a7a7cd59048ada9b51fe8faff545324c59

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -788,7 +788,7 @@
                }
                // 空闲判断
//                if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
                if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(4, command), false)) {
                if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(4, command))) {
                    return true;
                } else {
                    throw new CoolException("命令下发失败");
@@ -921,17 +921,17 @@
            LocMast locMast = locMastService.selectByLocNo(locNo);
            if (type == 1){
                locMast.setBarcode(barcode);
                locMast.setLocSts("F");
                locMast.setLocSts("Z");
                locMastService.updateById(locMast);
            }else if (type == 2){
                locMast.setBarcode("");
                locMast.setLocSts("O");
                locMastService.updateById(locMast);
                originLoc.setLocSts("K");
                originLoc.setBarcode("");
                locMastService.updateById(originLoc);
            }else if (type == 3){
                originLoc.setLocSts("O");
                originLoc.setLocSts("K");
                originLoc.setBarcode("");
                locMast.setBarcode(barcode);
                locMast.setLocSts("F");
                locMast.setLocSts("Z");
                locMastService.updateById(originLoc);
                locMastService.updateById(locMast);
            }