#入库条码站异常信号点

Junjie

17 小时以前 41ace7c0738ba39750b2809d5077dd0d7640ced8

#入库条码站异常信号点

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

@@ -129,6 +129,7 @@
                vo.setFullPlt(stationProtocol.isFullPlt()); // 是否满板
                vo.setRunBlock(stationProtocol.isRunBlock());// 运行堵塞
                vo.setEnableIn(stationProtocol.isEnableIn());// 启动入库
                vo.setInBarcodeError(stationProtocol.isInBarcodeError());// 入库条码站异常
                vo.setPalletHeight(stationProtocol.getPalletHeight()); // 托盘高度
                vo.setError(stationProtocol.getError()); // 错误码
                vo.setErrorMsg(stationProtocol.getErrorMsg()); // 报警信息

 src/main/java/com/zy/asrs/domain/vo/StationLatestDataVo.java

@@ -41,6 +41,9 @@
    // 启动入库
    private boolean enableIn;

    // 入库条码站异常
    private boolean inBarcodeError;

    // 托盘高度
    private Integer palletHeight;


 src/main/java/com/zy/core/model/protocol/StationProtocol.java

@@ -47,6 +47,9 @@
    // 启动入库
    private boolean enableIn;

    //入库条码站异常
    private boolean inBarcodeError;

    // 托盘高度
    private Integer palletHeight;


 src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java

@@ -68,6 +68,9 @@
    //启动入库
    private boolean enableIn = false;

    //入库条码站异常
    private boolean inBarcodeError = false;

    @Override
    public ZyStationStatusEntity clone() {
        try {

 src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java

@@ -153,6 +153,7 @@
                boolean[] status2 = siemensNet.getByteTransform().TransBool(result.Content, i * 10 + 7, 1);
                statusEntity.setEnableIn(status2[1]);//启动入库
                statusEntity.setRunBlock(status2[2]);//重新规划路线
                statusEntity.setInBarcodeError(status2[3]);//入库条码站异常

                Integer palletHeight = null;
                if (status[7]) {

 src/main/java/com/zy/core/plugin/GslProcess.java

@@ -195,7 +195,11 @@
        }

        if (stationProtocol.getError() <= 0) {
            return true;
            return true;//站点无故障
        }

        if (!stationProtocol.isInBarcodeError()) {
            return true;//站点无异常
        }

        Object lock = redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId());

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

@@ -160,6 +160,7 @@
                    stationProtocol.setBarcode(statusEntity.getBarcode());
                    stationProtocol.setRunBlock(statusEntity.isRunBlock());
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setInBarcodeError(statusEntity.isInBarcodeError());
                    stationProtocol.setWeight(statusEntity.getWeight());
                    stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
                    stationProtocol.setTaskBufferItems(statusEntity.getTaskBufferItems());

 src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java

@@ -99,6 +99,7 @@
                    stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
                    stationProtocol.setTaskBufferItems(statusEntity.getTaskBufferItems());
                    stationProtocol.setIoMode(statusEntity.getIoMode());
                    stationProtocol.setInBarcodeError(statusEntity.isInBarcodeError());
                    if (statusEntity.getTaskNo() != null && statusEntity.getTaskNo() > 0) {
                        taskNoSet.add(statusEntity.getTaskNo());
                    }

 src/main/webapp/components/DevpCard.js

@@ -288,6 +288,7 @@
        { label: "满板信号", value: MonitorCardKit.yesNo(item.fullPlt) },
        { label: "运行阻塞", value: MonitorCardKit.yesNo(item.runBlock) },
        { label: "启动入库", value: MonitorCardKit.yesNo(item.enableIn) },
        { label: "入库条码站异常", value: MonitorCardKit.yesNo(item.inBarcodeError) },
        { label: "托盘高度", value: this.orDash(item.palletHeight) },
        { label: "条码", value: this.orDash(item.barcode), code: true, type: "barcode" },
        { label: "重量", value: this.orDash(item.weight) },