Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-10-12 e828d99f25ba6736cdb0c31128aa4d976348bcb3

Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

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

@@ -35,6 +35,7 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -2022,7 +2023,7 @@
                            case 11://入库前判断充电线是否放好
                                olsStatus = 99;
                                newStatus = 0;
                                newSingle = 11;//不变
                                newSingle = 11;//
                                break;
                            case 12://充电线放好
                                olsStatus = 99;
@@ -2123,6 +2124,7 @@
                                locMast.setLocSts("O");
                                locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("channel",(i+1)));
                            }
                                //复位PLC信号，借用输送站点实体类
                                StaProtocol staProtocol = new StaProtocol();
                                staProtocol.setSiteId(i*2);//寄存器地址
@@ -2134,9 +2136,7 @@
                                } else {
                                    devpThread.startSignal[i] = newSingle;
                                }
                            }
                        }else { }

                    }

                }
@@ -2149,4 +2149,25 @@
        }
    }

    @Transactional
    public void fierCrn() {
        try {
            for (CrnSlave crn :slaveProperties.getCrn()) {
                // 获取堆垛机信息
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
                if (!Cools.isEmpty(locMast)){
                    //xie xin h
                } else {
                    //fu wei h
                }
            }
        } catch (Exception e) {
            log.error("火警  ===>> 给堆垛机发送警报失败", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }

}

 src/main/java/com/zy/core/MainProcess.java

@@ -69,6 +69,8 @@

                    //启动、完成、暂停测试系统测试
                    mainService.packTest();
                    //火警，给堆垛机发送火警警报
                    mainService.fierCrn();

                } catch (Exception e) {
                    e.printStackTrace();

 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java

@@ -45,11 +45,11 @@
                ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
                Constant.errorMap.remove(fire3030.getNo());
                LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
                LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","01001804"));
                LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","0101804"));
                if(null != locMast2) {
                    locMast2.setChannel(1000);
                    locMast2.setChannel(10000);
                    locMast2.setModiTime(new Date());
                    locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "01001804"));
                    locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "0101804"));
                }
                break;
            case FIRE_ALARM:

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

@@ -85,6 +85,9 @@
                        command.setDestinationPosZ((short)0);     // 目标库位层
                        write(command);
                        break;
                    case 4:
//                        siemensNet.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                        break;
                    default:
                        break;
                }

 src/main/webapp/views/index.html

@@ -23,6 +23,7 @@
<div class="sidebar">
    <div class="nav">
        <ul class="cl-effect-4">
            <li><button id="fire" style="background-color: #00FF00;border-radius: 30px">消防</button></li>
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
@@ -50,7 +51,27 @@
        localStorage.removeItem("token");
        window.location.href = baseUrl + "/login";
    }
    $.ajax({
        url: baseUrl + "/console/crn/detail",
        headers: {
            'token': localStorage.getItem('token')
        },
        data: {
            crnNo: id
        },
        method: 'post',
        success: function (res) {
            for (var val in res.data) {
                var find = $("#crnWindow").find(":input[name='" + val + "']");
                if (find[0].type === 'text') {
                    find.val(res.data[val]);
                } else if (find[0].type === 'checkbox') {
                    find.attr("checked", res.data[val] === 'Y');
                }
            }
        }

    })
    // 系统运行状态
    var systemRunning = true;
</script>

 src/main/webapp/views/index2.html

New file
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <title>自动仓库WCS系统</title>
    <link rel="stylesheet" href="../static/css/index.css">
    <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
    <style>
    </style>
</head>
<body>
<!-- 导航栏 -->
<!--        <div class="nav">-->
<!--            <li class="right">注销<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>-->
<!--        </div>-->
<div class="sidebar">
    <div class="nav">
        <ul class="cl-effect-4">
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
        </ul>
    </div>
</div>
<!--<div style="z-index: 999; position: absolute; top: 250px; left: 900px; width: 200px; height: 200px; opacity: 0.5;background-color: #0000FF">-->

<!--</div>-->
<!-- 主体内容 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
    Copyright © 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">立库wcs操作平台</a>
</footer>
</body>
<script>
    // 导航栏
    function nav(id) {
        $('.nav-select').attr("class", "nav-unselect");
        $('#'+id).attr("class", "nav-select");
        $('#content').attr("src", id+".html");
    }

    function logout() {
        localStorage.removeItem("token");
        window.location.href = baseUrl + "/login";
    }

    // 系统运行状态
    var systemRunning = true;
</script>
</html>