#

zc

2025-04-29 ef942fc4483059aa0526e913f9be41982df7bb79

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

@@ -182,7 +182,7 @@
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                    String errMsg = "";
                    if (!back && staProtocol.isBackErr()) {
                        errMsg = "超宽异常";
                        errMsg = "超长异常";
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
@@ -190,11 +190,7 @@
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                        errMsg = "超长异常";
                        back = true;
                    }
                    if (!back && staProtocol.isWeightErr()) {
                        errMsg = "超重";
                        errMsg = "超宽异常";
                        back = true;
                    }
                    // 退回
@@ -405,6 +401,29 @@
                if (wrkMast.getStaNo() == 1026) {
                    locNo = "1200305";
                }
                //获取提升机信息
                LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
                if (liftThread == null) {
                    continue;
                }

                LiftProtocol liftProtocol = liftThread.getStatus();
                if (liftProtocol == null) {
                    continue;
                }

                if (!liftThread.isIdle()) {
                    continue;
                }


                //判断提升机内是否有托盘
                if (liftProtocol.getHasTray()) {
                    News.info("{}任务，{}号提升机，提升机内无托盘，禁止派发", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
                    continue;
                }


                boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleNoLift(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP");
                if (!dispatchShuttle) {
                    News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
@@ -454,15 +473,19 @@
            if (wrkMast.getStaNo() == 1024) {
                locNo = "1200305";
            }

            boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleNoLift(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP");
            if (!dispatchShuttle) {
                News.info("{}任务，调度小车失败", wrkMast.getWrkNo());
                continue;
            }

            WrkMast wrkMast2 = wrkMastService.selectByMainWrkNo(wrkMast.getWrkNo());
            wrkMast.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN.sts);
            wrkMast.setSystemMsg("");//清空消息
            wrkMast.setModiTime(now);
            if (wrkMast2 != null) {
                wrkMast.setShuttleNo(wrkMast2.getShuttleNo());
            }
            if (!wrkMastService.updateById(wrkMast)) {
                News.info("{}任务，更新工作档失败", wrkMast.getWrkNo());
            } else {
@@ -944,7 +967,7 @@
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led);
            String errMsg = "";
            if (!back && staProtocol.isBackErr()) {
                errMsg = "超宽异常";
                errMsg = "超长异常";
                back = true;
            }
            if (!back && staProtocol.isHighErr()) {
@@ -952,7 +975,7 @@
                back = true;
            }
            if (!back && staProtocol.isRightErr()) {
                errMsg = "超长异常";
                errMsg = "超宽异常";
                back = true;
            }
            if (!back && staProtocol.isWeightErr()) {
@@ -968,7 +991,6 @@
                }
            }
            String barcode = staProtocol.getBarcode();



            if (!staProtocol.isLoading()) {
@@ -1800,6 +1822,14 @@
        try {
            this.recShuttleErr();
            this.recLiftErr();
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
            ledThread.errorReset();
            ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, 2);
            ledThread.errorReset();
            ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
            ledThread.errorReset();
            ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, 4);
            ledThread.errorReset();
        } catch (Exception e) {
            News.error("recErr fail", e);
        }