#

luxiaotao1123

2020-09-23 4c30a5d4e4d35b3d78355f0c2d8edf90b31a1b23

#

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

@@ -99,6 +99,7 @@
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(String.valueOf(staProtocol.getPosition())); // 台车位置
            vos.add(vo);
        }
        return R.ok().add(vos);

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

@@ -282,16 +282,6 @@
                        continue;
                    }

                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    staProtocol.setPakMk(false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (!result) {
                        log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
                        continue;
                    }

                    try {
                        // 保存工作明细档历史档
                        if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -325,6 +315,16 @@
                    } catch (Exception e) {
                        e.printStackTrace();
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        continue;
                    }

                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    staProtocol.setPakMk(false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (!result) {
                        log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
                    }

                }

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

@@ -43,6 +43,9 @@
    // 锁定标记
    private boolean pakMk = true;

    // 台车位置
    private Integer position;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);

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

@@ -138,6 +138,16 @@
                }
            }
        }
        // 台车位置
        OperateResultExOne<Integer> result2 = siemensS7Net.ReadInt32("DB100.48");
        if (result2.IsSuccess) {
            StaProtocol staProtocol = station.get(8);
            staProtocol.setPosition(result2.Content);
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】8号台车获取实时位置失败！！！", DateUtils.convert(new Date())));
            log.error("8号台车获取实时位置失败！！！");
        }

        if (result.IsSuccess && result1.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));
@@ -172,7 +182,7 @@
            return;
        }
        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 工作号
        Thread.sleep(100);
        Thread.sleep(300);
        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 目标站
//        boolean[] status = new boolean[8];
//        status[0] = staProtocol.isAutoing();

 src/main/webapp/views/console.html

@@ -512,6 +512,9 @@
                        } else {
                            siteEl.html(sites[i].siteId);
                        }
                        if (i===8) {
                            carAnimate(i, Number(sites[i].nearbySta));
                        }
                    }
                } else if (res.code === 403){
                    parent.location.href = baseUrl+"/login";