初步调试

zc

4 天以前 8e6af226babe20e42cbe0360b053c2044bcd8524

初步调试

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

@@ -182,33 +182,20 @@
                    boolean back = false;
                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
                    String errMsg = "";
                    if (staProtocol.isFrontErr()) {
                        errMsg = "前超限";
                        back = true;
                    }
                    if (!back && staProtocol.isBackErr()) {
                        errMsg = "后超限";
                        errMsg = "超宽异常";
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
                        errMsg = "高超限";
                        back = true;
                    }
                    if (!back && staProtocol.isLeftErr()) {
                        errMsg = "左超限";
                        errMsg = "超高异常";
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                        errMsg = "右超限";
                        errMsg = "超长异常";
                        back = true;
                    }
                    if (!back && staProtocol.isWeightErr()) {
                        errMsg = "超重";
                        back = true;
                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                        errMsg = "扫码失败";
                        log.error("物料码扫码失败");
                        back = true;
                    }
                    // 退回
@@ -222,11 +209,10 @@
                        // led 异常显示
                        if (ledThread != null) {
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                        }
                    }
                    if (ledThread != null) {
                        ledThread.error(errMsg);
                    }
                    }

                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading() && isInEnable(devpThread, inSta.getStaNo()) && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) && staProtocol.isPakMk()) {
                        String barcode = staProtocol.getBarcode();
@@ -896,7 +882,39 @@
            if (staProtocol == null) {
                return false;
            }

            int led = 1;
            if (wrkMast.getSourceStaNo() == 1022) {
                led = 3;
            } else if (wrkMast.getSourceStaNo() == 1031) {
            }
            // 尺寸检测异常
            boolean back = false;
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led);
            String errMsg = "";
            if (!back && staProtocol.isBackErr()) {
                errMsg = "超宽异常";
                back = true;
            }
            if (!back && staProtocol.isHighErr()) {
                errMsg = "超高异常";
                back = true;
            }
            if (!back && staProtocol.isRightErr()) {
                errMsg = "超长异常";
                back = true;
            }
            if (!back && staProtocol.isWeightErr()) {
                errMsg = "超重";
                back = true;
            }
            // 退回
            if (back) {
                // led 异常显示
                if (ledThread != null) {
                    MessageQueue.offer(SlaveType.Led, led, new Task(3, errMsg));
                    ledThread.error(errMsg);
                }
            }
            if (!staProtocol.isAutoing()) {
                News.info("{}任务，{}站点，不在自动状态", wrkMast.getWrkNo(), staProtocol.getSiteId());
                return false;

 src/main/java/com/zy/core/thread/impl/FyDevpThread.java

@@ -163,7 +163,7 @@
                staProtocol.setOutEnable(status[4]);// 可出

                staProtocol.setBackErr(status[5]);
                staProtocol.setLeftErr(status[6]);
                staProtocol.setHigh(status[6]);
                staProtocol.setRightErr(status[7]);
//                staProtocol.setHighErr(status[8]);
//                staProtocol.setWeightErr(status[9]);