Jcdm035-Mes.git

			@@ -136,10 +136,12 @@

			} else if(Constants.TWO.equals(valueString)){//出站
			if(Constants.OP040_OP160.contains(device)){//人工工位
			WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
			} else if (Constants.OP165.equals(device)) {
			WebSocketUsers.sendMessageToUserByText(map.get(device), "print");//打印
			} else if (Constants.OP0170_OP230.contains(device)) {
			if(Constants.OP165.equals(device)){
			WebSocketUsers.sendMessageToUserByText(map.get(device), "print");//打印
			}else {
			WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
			}
			} else if (Constants.OP0170_OP230.contains(device)) {
			WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
			} else{//自动工位
			//先判断是否有产品SN

			@@ -83,7 +83,7 @@
			<div style="text-align: center;margin-top: 64px">
			<span style="font-size: 29px;">电驱系统总成</span>
			</div>
			<div style="display: flex;margin-top: 2px;margin-left: 37px;font-size: 15px">
			<div style="display: flex;margin-top: 2px;margin-left: 44px;font-size: 15px">
			<div class="div1">
			<div >
			<span>电机型号：</span><span>TZ180XSDSZX01</span><br>
			@@ -111,7 +111,7 @@
			</div>
			</div>

			<div class="div2" style="font-size: 15px;margin-left: 17px">
			<div class="div2" style="font-size: 15px;margin-left: 12px">
			<div>
			<span>控制器型号：</span><span>KTZ34X23SZX07</span><br>
			</div>
			@@ -143,7 +143,7 @@
			</div>


			<div style="text-align: center;margin-top: 97px;font-size: 20px">
			<div style="text-align: center;margin-top: 101px;font-size: 20px">
			<div style="margin-top: 8px">
			<span style="font-size: 22px">TZ180XSDSZX01</span><br>

			@@ -166,9 +166,9 @@
			</div>
			</div>

			<div style="margin-top: 56px;display: flex;margin-left: 32px">
			<div style="margin-top: 61px;display: flex;margin-left: 45px">
			<div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>
			<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 26px">
			<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
			<span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
			P9900166410#T{{headContent.sfcCode}}
			</span><br>
			@@ -179,9 +179,9 @@
			</div>
			</div>

			<div style="margin-top: 42px;display: flex;margin-left: 32px">
			<div style="margin-top: 48px;display: flex;margin-left: 45px">
			<div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>
			<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 26px">
			<div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
			<span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
			P9900166410#T{{headContent.sfcCode}}
			</span><br>
			@@ -192,7 +192,7 @@
			</div>
			</div>

			<div style="text-align: center;margin-left: -190px;margin-top: 45px">
			<div style="text-align: center;margin-left: -190px;margin-top: 35px">
			<div style="margin-top: 4px">
			<span>9900200461</span><br>
			</div>
			@@ -550,6 +550,8 @@
			this.cakeLamp.scanFinish = 1
			this.cakeLamp.startWork = 1
			this.cakeLamp.InPlace = 1
			this.test1()
			this.test2()
			}
			});
			},
			@@ -639,7 +641,6 @@
			//socket从后台向前台推送数据
			this.ws.onmessage = function (event) {
			if (event.data === "print") {
			self.$message('postman调用打印方法打印！');
			document.getElementById('print').click();
			}else if (event.data === "IN") {
			self.cakeLamp.InPlace = 1;

	jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jcdm-ui/src/views/main/kb/stationTerminal/index.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史