YiWuProject.git

			@@ -30,12 +30,10 @@
			@Autowired
			private DownStorageCageDetailsMapper selectInfo;
			private GlassInfoService GlassInfoService;
			private DownStorageCageDetailsService downStorageCageDetailsService;
			private DownStorageCageService downStorageCageService;
			private DownGlassTaskService downGlassTaskService;

			/**
			* @param Number //识别逻辑不交互
			*/


			// public void identify(String Number) {
			// //查询任务
			@@ -81,21 +79,23 @@

			public boolean processInto(String Number) {
			GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
			downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);

			//按id查询玻璃信息表里的玻璃
			GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
			PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
			//存在此玻璃编号
			if (GlassInfo != null) {
			//同钢化版图内的栅格号找到相同版图id并且大于前面的顺序的空格
			List<DownStorageCageDetails> list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
			List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByLayoutAndSequence(GlassInfo.getTemperingLayoutId(), GlassInfo.getTemperingFeedSequence(), GlassInfo.getWidth());
			//空栅格号
			if (list.size() == 0) {
			//查询笼子内空闲
			list = selectInfo.SelectCacheLeisure();
			list = downStorageCageService.getCacheLeisure();
			}
			//小于此玻璃钢化版图序号的栅格号
			if (list.size() == 0) {
			list = selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
			list = downStorageCageService.getIsExistIntoCacheByLayout(GlassInfo.getTemperingLayoutId(), GlassInfo.getWidth());
			}
			if (list.size() > 0) {
			//存在空格
			@@ -123,7 +123,7 @@
			String G11 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
			String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
			PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
			log.println("666"); ;

			List<DownStorageCageDetails> list = selectInfo.SelectCacheOut(1, 5);
			List<DownStorageCageDetails> list2 = selectInfo.SelectCacheOut(6, 10);
			List<DownStorageCageDetails> list3 = selectInfo.SelectCacheOut(1, 10);
			@@ -180,16 +180,11 @@
			}




			// 返回结果
			return false;
			}

			//查询是否绑定架子
			// public boolean selectFlowCardId(String FlowCardId){
			//
			// }


			/**
			* @param Number