YiWuProject.git

			@@ -1,6 +1,5 @@
			package com.mes.common;

			import cn.hutool.core.date.DateTime;
			import cn.hutool.json.JSONObject;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			@@ -17,10 +16,7 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.*;

			@Service
			@Slf4j
			@@ -91,7 +87,7 @@
			taskCache.setStartCell(0);
			taskCache.setEndCell(edgStorageCage.getSlot());
			taskCache.setTaskType(1);
			taskCache.setCreateTime(new DateTime());
			taskCache.setCreateTime(new Date());
			edgStorageCageDetailsMapper.updateById(edgStorageCageDetails);
			taskCacheService.insertTaskCache(taskCache);
			S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
			@@ -129,7 +125,7 @@
			taskCache.setStartCell(outEdgStorageCageDetails.getSlot());
			taskCache.setEndCell(endcell);
			taskCache.setTaskType(2);
			taskCache.setCreateTime(new DateTime());
			taskCache.setCreateTime(new Date());
			taskCacheService.insertTaskCache(taskCache);
			S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
			}
			@@ -153,18 +149,16 @@
			}
			mapValue.put(key, value);
			}

			S7object.getinstance().plccontrol.WriteWord(S7object.getinstance().PlcMesObject.getPlcParameter("A06_request_word").getAddress(), (short)1);
			try {
			Thread.sleep(1000);
			taskCacheService = WebSocketServer.applicationContext.getBean(TaskCacheService.class);
			glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
			edgStorageCageService = WebSocketServer.applicationContext.getBean(EdgStorageCageService.class);
			edgStorageCageDetailsMapper = WebSocketServer.applicationContext.getBean(EdgStorageCageDetailsMapper.class);
			// initialize();//初始化数据
			if ("0".equals(mapValue.get("A06_request_word"))) {
			if ("0".equals(S7object.getinstance().PlcMesObject.getPlcParameter("A06_request_word"))) {
			//清除
			S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 0);
			} else if ("1".equals(mapValue.get("A06_request_word")) &&
			"0".equals(mapValue.get("MES_confirmation_word"))) {
			} else if ("1".equals(S7object.getinstance().PlcMesObject.getPlcParameter("A06_request_word")) &&
			"0".equals(S7object.getinstance().PlcMesObject.getPlcParameter("MES_confirmation_word"))) {

			inTo();
			} else if ("2".equals(mapValue.get("A06_request_word")) &&