~zhoushihao/YiWuProject.git

			@@ -1,16 +1,13 @@
			package com.mes.job;

			import cn.hutool.json.JSONObject;
			import cn.smallbun.screw.core.util.CollectionUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
			import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			@@ -23,9 +20,6 @@
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.BufferedReader;
			import java.io.InputStreamReader;
			import java.net.Socket;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			@@ -67,7 +61,7 @@
			carPostion.add(0.5);
			jsonObject.append("carPostion", carPostion);
			//界面展示笼子信息
			jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail());
			jsonObject.append("bigStorageCageInfos", bigStorageCageDetailsService.querybigStorageCageDetail());

			try{
			//进片任务数据
			@@ -88,6 +82,22 @@
			}
			}
			jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);

			//进片联机
			ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
			jsonObject.append("inkageEntity", inkageEntity.getValue());
			//进片请求
			ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
			jsonObject.append("requestEntity", requestEntity.getValue());
			//启动命令
			ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
			jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
			//出片联机
			ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
			jsonObject.append("outInkageEntity", outInkageEntity.getValue());
			//出片请求
			ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
			jsonObject.append("outRequestEntity", outRequestEntity.getValue());
			}catch(Exception e){
			//todo:不做任务处理
			}