zy-wcs.git - Gitblit

parent: 88e0e209 | 补丁 | 提交 | ignore whitespace

lsh

2022-10-12 f6decf71aa936d019a7732970744c6c33f5e6175

1个文件已添加

2个文件已修改

	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index2.html	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -2022,7 +2022,7 @@
                            case 11://入库前判断充电线是否放好
                                olsStatus = 99;
                                newStatus = 0;
                                newSingle = 11;//不变
                                newSingle = 11;//
                                break;
                            case 12://充电线放好
                                olsStatus = 99;
@@ -2123,27 +2123,19 @@
                                locMast.setLocSts("O");
                                locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("channel",(i+1)));
                                //复位PLC信号，借用输送站点实体类
                                StaProtocol staProtocol = new StaProtocol();
                                staProtocol.setSiteId(i*2);//寄存器地址
                                staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
                                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                                if(!result){
                            }
                            //复位PLC信号，借用输送站点实体类
                            StaProtocol staProtocol = new StaProtocol();
                            staProtocol.setSiteId(i*2);//寄存器地址
                            staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                            if(!result){
//                                log.error("更新库位紧急出库信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
//                                throw new CoolException("更新测试信号失败===>>" + i);
                                } else {
                                    devpThread.startSignal[i] = newSingle;
                                }
                            } else {
                                devpThread.startSignal[i] = newSingle;
                            }
                        }else { }
                        TestMast testMast0101804 = testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("loc_no","0101804"));//查找原来的状态
                        if (!Cools.isEmpty(testMast0101804)){
                            if (testMast0101804.getChannel()>10240){

                            }
                        }

                    }

                }

 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>

			@@ -2022,7 +2022,7 @@
			case 11://入库前判断充电线是否放好
			olsStatus = 99;
			newStatus = 0;
			newSingle = 11;//不变
			newSingle = 11;//
			break;
			case 12://充电线放好
			olsStatus = 99;
			@@ -2123,27 +2123,19 @@
			locMast.setLocSts("O");
			locMastService.update(locMast,new EntityWrapper<LocMast>()
			.eq("channel",(i+1)));
			//复位PLC信号，借用输送站点实体类
			StaProtocol staProtocol = new StaProtocol();
			staProtocol.setSiteId(i*2);//寄存器地址
			staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
			if(!result){
			}
			//复位PLC信号，借用输送站点实体类
			StaProtocol staProtocol = new StaProtocol();
			staProtocol.setSiteId(i*2);//寄存器地址
			staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
			if(!result){
			// log.error("更新库位紧急出库信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
			// throw new CoolException("更新测试信号失败===>>" + i);
			} else {
			devpThread.startSignal[i] = newSingle;
			}
			} else {
			devpThread.startSignal[i] = newSingle;
			}
			}else { }
			TestMast testMast0101804 = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("loc_no","0101804"));//查找原来的状态
			if (!Cools.isEmpty(testMast0101804)){
			if (testMast0101804.getChannel()>10240){

			}
			}

			}

			}

			@@ -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>

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>