#
luxiaotao1123
2022-09-20 e7ee6502ce70f0aa1728b9a67780ec28f6218a45
#
2个文件已修改
15 ■■■■ 已修改文件
src/main/java/com/zy/core/thread/SiemensDevpThread.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pipeline.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -179,8 +179,8 @@
        // 充电信号位
        Thread.sleep(100);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
        if (result2.IsSuccess) {
            boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, 0, 1);
        if (result3.IsSuccess) {
            boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
            charge0 = status[0];
            charge1 = status[1];
            charge2 = status[2];
@@ -269,7 +269,7 @@
     * @param open true 开始充电;false 结束充电
     */
    public boolean charge(int index, boolean open) {
        OperateResult write = siemensS7Net.Write("DB102.50." + index + 3, open);
        OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open);
        if (!write.IsSuccess) {
            log.error("输送线plc编号={} {}号充电桩{}控制失败", slave.getId(), index + 1, open?"打开":"关闭");
            return false;
src/main/webapp/views/pipeline.html
@@ -73,13 +73,12 @@
                            </div>
                        </fieldset>
                    </div>
                    <div>
                        <span style="color: #1E9FFF">PLC异常信息表:</span>
                    </div>
                </div>
                <!-- 主体 -->
                <div class="plc-log-body">
                    <div>
                        <span style="color: #1E9FFF">PLC异常信息表:</span>
                    </div>
                    <table id="plc-error-table">
                        <thead>
                        <tr>
@@ -227,7 +226,7 @@
                            method: 'POST',
                            success: function (res) {
                                if (res.code === 200){
                                    layer.msg(res.msg, {icon: 1})
                                    layer.msg("操作成功,请耐心等待一分钟", {icon: 1})
                                } else if (res.code === 403){
                                    window.location.href = baseUrl+"/login";
                                }  else {