四期

zhangc

2025-03-09 dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -192,7 +192,12 @@
                    break;
                case 11:
                case 12:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    AgvLocDetl agvLocDetl1 = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
                    if (agvLocDetl1 == null) {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    } else {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    }
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    //修改源库位状态为O
@@ -433,11 +438,17 @@
                    //目标站点
                    if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
                        if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
                            AgvLocMast locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG,true);
                            if (locByFloor != null) {
                            AgvLocMast locByFloor = null;
                            try {
                                locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG, true);
                            } catch (Exception e) {

                            }
                            if (locByFloor != null && locByFloor.getLocNo().endsWith("02F1")) {
                                AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
                                agvLocMast.setLocSts("O");
                                agvLocMast.setModiTime(now);
                                agvLocMast.setBarcode("");
                                agvLocMastService.updateById(agvLocMast);
                                wrkMast.setLocNo(locByFloor.getLocNo());
                            } else {