YiWuProject.git

			@@ -80,6 +80,8 @@

			@Scheduled(fixedDelay = 1000)
			public void plcHomeEdgTask() {
			Date startDate = new Date();
			log.info("本次任务开始执行时间：{}", startDate);
			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
			String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
			@@ -124,6 +126,8 @@
			inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
			}
			}
			Date endDate = new Date();
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			public void plcToHomeEdgTask() {
			@@ -263,8 +267,8 @@
			EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
			} else {
			//判断两条线是否都空闲
			endcell = out08Glassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
			//按照状态判断两条线走那条线
			endcell = computerLineByState(out08Glassstate, out10Glassstate);

			if (out08Glassstate == 1 && out10Glassstate == 1) {
			EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			@@ -486,13 +490,15 @@
			boolean b10 = a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight() == glassInfo.getHeight()
			&& a10EdgStorageCageDetails.getWidth() == glassInfo.getWidth();
			//存在出片任务 07为空
			if (b08) {
			return out08Glassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
			if (out08Glassstate == 1 && out10Glassstate == 1) {
			if (b08) {
			return Const.A09_OUT_TARGET_POSITION;
			}
			if (b10) {
			return Const.A10_OUT_TARGET_POSITION;
			}
			}
			if (b10) {
			return out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
			}
			return out08Glassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
			return computerLineByState(out08Glassstate, out10Glassstate);
			}

			/**
			@@ -653,6 +659,27 @@
			return edgGlassTaskInfoService.save(edgGlassTaskInfo);
			}

			/**
			* 计算出片线路
			* 已排除都为2 都为0 的情况
			*
			* @param out08Glassstate
			* @param out10Glassstate
			* @return
			*/
			private int computerLineByState(int out08Glassstate, int out10Glassstate) {
			if (out08Glassstate == 0) {
			if (out10Glassstate == 2) {
			return Const.A09_OUT_TARGET_POSITION;
			} else {
			return Const.A10_OUT_TARGET_POSITION;
			}
			} else if (out08Glassstate == 1) {
			return Const.A09_OUT_TARGET_POSITION;
			} else {
			return Const.A10_OUT_TARGET_POSITION;
			}
			}

			@Scheduled(fixedDelay = 1000)
			public void CacheGlassTasks() {