~admin/HangZhouMes.git

			@@ -14,7 +14,7 @@
			public class S7object extends Thread {
			public S7control plccontrol; // PLC通讯类实例
			private EPlcType plcType = EPlcType.S1200; // 西门子PLC类型
			private String ip = "192.168.10.1"; // plc ip地址
			private String ip = "192.168.10.11"; // plc ip地址
			private int port = 102; // plc 端口号

			@@ -148,6 +148,7 @@
			private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) {
			log.info("1、按照玻璃id:{}获取玻璃小片信息,当前格子为:{}", glassId, currentSlot);
			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
			//TODO: 查询玻璃
			if (glassInfo == null) {
			log.info("2、此玻璃编号不存在");
			return;
			@@ -278,6 +279,7 @@
			private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) {
			List<EdgStorageCageDetails> glassList = new ArrayList<>();
			//获取待进片玻璃
			//todo: 获取正在执行的工程信息
			if (StringUtils.isNotBlank(glassId)) {
			GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getGlassId, glassId));

			@@ -52,10 +52,10 @@
			int workId = upwork.getWorkstationId();//工位id
			double width = upwork.getPatternWidth();//宽度
			double height = upwork.getPatternHeight();//高度
			S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
			S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
			S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
			S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
			S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), (short) workId);
			S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (short) width);
			S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (short) height);
			S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), (short) 1);
			//更改上片表状态
			upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);

	hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/S7object.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史