侧面出库完成上报执行状态替代plc码盘完成信号交互

pang.jiabao

2 天以前 3b17ccf3fd001cbec7a8bac368f07cd9237faae8

侧面出库完成上报执行状态替代plc码盘完成信号交互

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

@@ -255,10 +255,10 @@
                            boolean offer = false;
                            try {
                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                                staProtocol.setMp(taskWrk.getMp());
                                staProtocol.setLx(taskWrk.getLx());
                                staProtocol.setLev(taskWrk.getLev());
                                MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
//                                staProtocol.setMp(taskWrk.getMp());
//                                staProtocol.setLx(taskWrk.getLx());
//                                staProtocol.setLev(taskWrk.getLev());
//                                MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
                            } catch (Exception e) {
                                log.error("下发输送线任务失败：异常:" + e);
                                log.error("下发输送线任务失败：异常:offer:" + offer);
@@ -269,7 +269,8 @@
                                taskWrk.setWrkSts(14);
                                taskWrk.setCompleteTime(new Date());
                                taskWrkService.updateById(taskWrk);

                                // 侧面出库完成 上报执行状态
                                toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
                            } else {
                                log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            }

 src/main/java/com/zy/asrs/task/TaskReportScheduler.java

@@ -86,8 +86,8 @@
        add(301);add(302);add(303);add(304);add(305);add(306);add(307);add(308);
    }};

    // 侧面码盘完成上报wms
    @Scheduled(cron = "0/3 * * * * ? ")
    // 侧面码盘完成上报wms -弃用，出库完成时候上报状态
//    @Scheduled(cron = "0/3 * * * * ? ")
    public synchronized void reportPalletizingCompleted() {
        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        if (devpThread != null) {

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -303,13 +303,13 @@
            }

            // 读侧面码盘完成信号
            OperateResultExOne<byte[]> resultMp = siemensS7Net.Read("DB79.362", (short) 4);
            if (resultMp.IsSuccess) {
                StaProtocol staProtocol207 = station.get(207);
                StaProtocol staProtocol212 = station.get(212);
                staProtocol207.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 0));
                staProtocol212.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 2));
            }
//            OperateResultExOne<byte[]> resultMp = siemensS7Net.Read("DB79.362", (short) 4);
//            if (resultMp.IsSuccess) {
//                StaProtocol staProtocol207 = station.get(207);
//                StaProtocol staProtocol212 = station.get(212);
//                staProtocol207.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 0));
//                staProtocol212.setMpCompletedFlag(siemensS7Net.getByteTransform().TransInt16(resultMp.Content, 2));
//            }

            // 读取正面条码
            OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB103.0", (short) (5 * 40));

 src/main/webapp/views/taskWrk/taskWrk.html

@@ -94,8 +94,8 @@
                        </el-table-column>
                        <el-table-column property="lev" label="码盘层数">
                        </el-table-column>
                        <el-table-column property="mpCompletedReport$" label="码盘上报">
                        </el-table-column>
<!--                        <el-table-column property="mpCompletedReport$" label="码盘上报">-->
<!--                        </el-table-column>-->
                    </el-table>

                    <div style="margin-top: 10px;">

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -77,8 +77,8 @@
                        </el-table-column>
                        <el-table-column property="lev" label="码盘层数">
                        </el-table-column>
                        <el-table-column property="mpCompletedReport$" label="码盘上报">
                        </el-table-column>
<!--                        <el-table-column property="mpCompletedReport$" label="码盘上报">-->
<!--                        </el-table-column>-->
                    </el-table>

                    <div style="margin-top: 10px;">