#

Junjie

3 小时以前 ade2ee628437d38cb7c11dd456a5ea18dff97325

#

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

@@ -126,6 +126,7 @@
                vo.setErrorMsg(stationProtocol.getErrorMsg()); // 报警信息
                vo.setBarcode(stationProtocol.getBarcode()); // 条码
                vo.setWeight(stationProtocol.getWeight());//重量
                vo.setTaskWriteIdx(stationProtocol.getTaskWriteIdx());//任务可写区
                String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
                if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
                    String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);

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

@@ -55,4 +55,7 @@
    //重量
    private Double weight;

    //任务可写区
    private Integer taskWriteIdx;

}

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

@@ -64,6 +64,9 @@
    //WCS系统报警
    private String systemWarning;

    //任务可写区
    private Integer taskWriteIdx;

   /**
    * 扩展数据
    */

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

@@ -229,7 +229,7 @@
        int stationIdx = findIndex(command.getStationId());

        short[] data = new short[2];
        data[0] = command.getStationId().shortValue();
        data[0] = (short) 0;
        data[1] = command.getTargetStaNo().shortValue();

        OperateResult writeTaskNo = siemensNet.Write("DB13." + (stationIdx * 48 + (taskWriteIdx * 12)), command.getTaskNo());

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

@@ -143,6 +143,7 @@
                    stationProtocol.setRunBlock(statusEntity.isRunBlock());
                    stationProtocol.setEnableIn(statusEntity.isEnableIn());
                    stationProtocol.setWeight(statusEntity.getWeight());
                    stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
                }

                if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {

 src/main/webapp/components/DevpCard.js

@@ -58,6 +58,7 @@
                  <span v-else @click.stop="handleBarcodeClick(item)" style="cursor: pointer; color: #409EFF;">-</span>
                </el-descriptions-item>
                <el-descriptions-item label="重量">{{ item.weight }}</el-descriptions-item>
                <el-descriptions-item label="任务可写区">{{ item.taskWriteIdx }}</el-descriptions-item>
                <el-descriptions-item label="故障代码">{{ item.error }}</el-descriptions-item>
                <el-descriptions-item label="故障信息">{{ item.errorMsg }}</el-descriptions-item>
                <el-descriptions-item label="扩展数据">{{ item.extend }}</el-descriptions-item>