YiWuProject.git

			@@ -71,22 +71,22 @@

			@Scheduled(fixedDelay = 1000)
			public void rawStorageTask() throws Exception {
			ReadWriteEntity requestWord = miloService.readFromOpcUa("PLC.CC.request");
			ReadWriteEntity confireWord = miloService.readFromOpcUa("PLC.CC.confirmation");
			ReadWriteEntity reportWord = miloService.readFromOpcUa("PLC.CC.reportWord");
			ReadWriteEntity taskWord = miloService.readFromOpcUa("PLC.CC.taskWord");
			ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
			ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
			ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
			ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
			String requestValue = requestWord.getValue() + "";
			if ("0".equals(requestValue)) {
			if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
			List<ReadWriteEntity> list = new ArrayList<>();
			list.add(generateReadWriteEntity("PLC.CC.confirmation", 0));
			list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
			miloService.writeToOpcWord(list);
			}
			if ("1".equals(taskWord.getValue() + "")) {
			List<ReadWriteEntity> list = new ArrayList<>();
			list.add(generateReadWriteEntity("PLC.CC.taskWord", 0));
			list.add(generateReadWriteEntity("PLC.CC.startSlot", 0));
			list.add(generateReadWriteEntity("PLC.CC.endSlot", 0));
			list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
			list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
			list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
			miloService.writeToOpcWord(list);
			}
			return;
			@@ -122,7 +122,7 @@

			@Scheduled(fixedDelay = 1000)
			public void rawStorageInCar() throws Exception {
			ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.inCar");
			ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
			String value = entity.getValue() + "";
			if (!"1".equals(value)) {
			log.info("大车上没有架子");
			@@ -142,7 +142,7 @@

			@Scheduled(fixedDelay = 1000)
			public void rawStorageFinish() throws Exception {
			ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.reportWord");
			ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
			String value = entity.getValue() + "";
			if ("0".equals(value)) {
			log.info("当前任务未汇报，结束本次任务");
			@@ -207,7 +207,7 @@

			}
			List<ReadWriteEntity> list = new ArrayList<>();
			list.add(generateReadWriteEntity("PLC.CC.confirmation", 1));
			list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
			miloService.writeToOpcWord(list);
			}

			@@ -266,10 +266,10 @@
			rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);

			// List<ReadWriteEntity> list = new ArrayList<>();
			// list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
			// list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
			// list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
			// list.add(generateReadWriteEntity("PLC.CC.endSlot", lefting));
			// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
			// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
			// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
			// list.add(generateReadWriteEntity("CC.CC.endSlot", lefting));
			// miloService.writeToOpcWord(list);

			//修改出片任务状态
			@@ -300,10 +300,10 @@
			rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
			details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
			// List<ReadWriteEntity> list = new ArrayList<>();
			// list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
			// list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
			// list.add(generateReadWriteEntity("PLC.CC.startSlot", details.getSlot()));
			// list.add(generateReadWriteEntity("PLC.CC.endSlot", details.getShelf()));
			// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
			// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
			// list.add(generateReadWriteEntity("CC.CC.startSlot", details.getSlot()));
			// list.add(generateReadWriteEntity("CC.CC.endSlot", details.getShelf()));
			// miloService.writeToOpcWord(list);
			//生成工位任务，将吊装位的玻璃状态改位进笼中
			//修改吊装位的原片状态为103 出片中
			@@ -390,11 +390,15 @@
			log.info("2号上片位玻璃尺寸不一致，1号上片位生成调度任务");
			//按照尺寸及数量获取数量最接近的格子信息
			RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
			if(null == rawDetails){
			log.info("仓库内无需要上架的玻璃");
			return Boolean.FALSE;
			}
			rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
			//结束调度任务修改工位状态(起始位）状态为103 RAW_GLASS_STATE_RUNNING 任务完成后将状态改为101 目标位新增一条数据，架子号为（起始位）
			rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
			.eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
			.set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
			.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
			return Boolean.TRUE;
			}
			} else {
			@@ -404,7 +408,7 @@
			rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
			rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
			.eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
			.set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
			.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
			return Boolean.TRUE;
			}
			} else {