Jcdm035-Mes.git

			@@ -26,13 +26,18 @@
			import com.jcdm.main.restful.qingYan.doman.ChildVO;
			import com.jcdm.main.restful.qingYan.doman.ParentVO;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.model.WriteEntity;
			import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
			import com.kangaroohy.milo.service.MiloService;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.xmlbeans.GDate;
			import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime;
			import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
			import org.springframework.stereotype.Component;

			import javax.websocket.Session;
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.concurrent.CompletableFuture;
			import java.util.stream.Collectors;
			@@ -116,7 +121,6 @@
			}
			}else {
			Integer recordDataDone = 11;
			miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".StartTime").value(new Date()).build());
			miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
			}
			} else if(Constants.TWO.equals(valueString)){//出站

			@@ -9,7 +9,7 @@
			<el-col :span="17">
			<el-card shadow="never">
			<span class="head-font">物料编码 : </span>
			<el-input style="width: 50%" ref="inputData" v-model="materialCode" @change="handleEnter" @keyup="handleEnter" placeholder="请扫描物料编码"></el-input>
			<el-input style="width: 50%" ref="inputData" v-model="materialCode" @change="handleEnter" placeholder="请扫描物料编码"></el-input>
			<el-button type="primary" style="float: right" icon="el-icon-search" @click="serialLink">串口连接</el-button>
			<el-button @click="clearClick" style="float: right" type="danger" >清除</el-button>
			</el-card>
			@@ -234,7 +234,8 @@
			console.log(tab, event);
			},
			handleEnter() {
			this.serialPortMethod(this.materialCode)
			this.serialPortMethod(this.materialCode);
			this.setFocus();
			this.$message("扫描物料编码"+this.materialCode);
			},
			getWorkOrders(){

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