999

zhangc

2025-04-17 6c467481fdaccead755bb803224c555b42e5579b

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

@@ -101,11 +101,6 @@
    private BasWrkStatusService wrkStatusService;


    public static List<Integer> staNosIn = new ArrayList<Integer>() {{
        add(1015);
        add(1026);
    }};

    private boolean isInEnable(DevpThread devpThread, Integer staNo) {
        if (staNo == null) {
            return false;
@@ -290,7 +285,7 @@
                    if (liftWrkMast != null) {
                        if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//提升机任务和当前任务不相同
                            News.taskInfo(wrkMast.getWrkNo(), "{}任务，{}号提升机，提升机存在未完成任务，禁止派发", wrkMast.getWrkNo(), 1);
                            return;
                            continue;
                        }
                    }
                    wrkMast.setLiftNo(1);
@@ -302,24 +297,24 @@


                String locNo = "1200301";
                if (wrkMast.getStaNo() == 1025) {
                if (wrkMast.getStaNo() == 1026) {
                    locNo = "1200305";
                }
                boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP");
                if (!dispatchShuttle) {
                    News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                    return;
                    continue;
                } else {
                    News.info("{}任务，调度小车失成功", wrkMast.getWrkNo());
                }
                wrkMast.setWrkSts(WrkStsType.INBOUND_SHUTTLE_RUN.sts);
                wrkMast.setLiftNo(null);
                wrkMast.setSystemMsg("");//清空消息
                wrkMast.setModiTime(new Date());
                if (wrkMastService.updateById(wrkMast)) {
                    return;
                if (!wrkMastService.updateById(wrkMast)) {
                    News.info("{}任务，更新工作档失败", wrkMast.getWrkNo());
                }
            }


        }
    }

@@ -332,21 +327,21 @@
        List<WrkMast> wrkSts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts).in("sta_no", 1013, 1024));
        for (WrkMast wrkMast : wrkSts) {
            if (devpThread == null) {
                return;
                continue;
            }
            Map<Integer, StaProtocol> station = devpThread.getStation();
            StaProtocol staProtocol = station.get(wrkMast.getStaNo());
            if (staProtocol == null) {
                return;
                continue;
            }

            if (!staProtocol.isAutoing()) {
                News.info("{}任务，{}站点，不在自动状态", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return;
                continue;
            }
            if (!staProtocol.isOutEnable()) {
                News.info("{}任务，{}站点，没有可出信号", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return;
                continue;
            }
            String locNo = "1200301";
            if (wrkMast.getStaNo() == 1024) {
@@ -355,7 +350,7 @@
            boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP");
            if (!dispatchShuttle) {
                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                return;
                continue;
            } else {
                News.info("{}任务，无提升机处调度小车成功", wrkMast.getWrkNo());
            }
@@ -363,8 +358,11 @@
            wrkMast.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN.sts);
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);
            if (wrkMastService.updateById(wrkMast)) {
                return;
            if (!wrkMastService.updateById(wrkMast)) {
                News.info("{}任务，更新工作档失败", wrkMast.getWrkNo());
            } else {
                WrkMast wrkMast1 = wrkMastService.selectByMainWrkNo(wrkMast.getWrkNo());
                News.info("{}任务，移动任务生成成功——1", wrkMast1.getWrkNo());
            }
        }
    }
@@ -834,7 +832,6 @@
            boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));

            wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
            wrkMast.setLiftNo(1);
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);
            if (wrkMastService.updateById(wrkMast)) {
@@ -909,19 +906,42 @@
                News.info("{}任务，{}站点，无托盘", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return false;
            }

            if (sourceStaNo == 1023) {
                if (staProtocol.getFinishWorkNo().intValue() != wrkMast.getWrkNo()) {
                    News.info("{}任务，{}站点，任务号不一致", wrkMast.getWrkNo(), staProtocol.getSiteId());
                    return false;
                }
                if (!station.get(1022).getBarcode().equals(wrkMast.getBarcode())) {
                    News.info("{}任务，{}站点，托盘码不匹配，站点托盘码：{}，任务托盘码：{}", wrkMast.getWrkNo(), staProtocol.getSiteId(), staProtocol.getBarcode(), wrkMast.getBarcode());
                    return false;
                }
            } else {
            if (staProtocol.getWorkNo().intValue() != wrkMast.getWrkNo()) {
                News.info("{}任务，{}站点，任务号不一致", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return false;
            }

            if (!staProtocol.getBarcode().equals(wrkMast.getBarcode())) {
                News.info("{}任务，{}站点，托盘码不匹配，站点托盘码：{}，任务托盘码：{}", wrkMast.getWrkNo(), staProtocol.getSiteId(), staProtocol.getBarcode(), wrkMast.getBarcode());
                return false;
            }
            }

            String locNo = "0200305";
            if (wrkMast.getSourceStaNo() == 1012) {
                locNo = "0200301";
            }
            boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
            if (!dispatchShuttle) {
                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                return false;
            }

            int lev = 105;
            if (wrkMast.getSourceStaNo() == 1012) {
                lev = 101;
            }
            //获取提升机命令
            List<LiftCommand> liftCommands = liftThread.getPalletInCommand(wrkMast.getWrkNo(), wrkMast.getSourceStaNo(), 101);
            List<LiftCommand> liftCommands = liftThread.getPalletInCommand(wrkMast.getWrkNo(), sourceStaNo, lev);
            LiftCommand liftCommand = liftCommands.get(0);

            int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号
@@ -981,15 +1001,15 @@
                News.info("{}任务，{}号提升机，提升机内无托盘，禁止派发", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
                return false;
            }
            String locNo = "0200305";
            if (wrkMast.getStaNo() == 1011) {
                locNo = "0200301";
            }
            boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
            if (!dispatchShuttle) {
                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                return false;
            }
//            String locNo = "0200305";
//            if (wrkMast.getStaNo() == 1011) {
//                locNo = "0200301";
//            }
//            boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
//            if (!dispatchShuttle) {
//                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
//                return false;
//            }

            wrkMast.setWrkSts(WrkStsType.INBOUND_SHUTTLE_RUN.sts);
            // TODO 测试中发现不能解禁，因为提升机里存在托盘，就不能解禁，不然另一辆小车可能会近提升机
@@ -1541,7 +1561,7 @@
            Map<Integer, StaProtocol> station = devpThread.getStation();
            WrkMast wrkMast = null;
            for (StaProtocol staProtocol : station.values()) {
                if (staProtocol.getSiteId() == 1013 || staProtocol.getSiteId() == 1014) {
                if (staProtocol.getSiteId() == 1013 || staProtocol.getSiteId() == 1024) {
                    wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getFinishWorkNo()).eq("wrk_sts", WrkStsType.OUTBOUND_DEVP_RUN.sts));
                    if (wrkMast != null) {
                        wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);