YiWuProject.git

			@@ -142,7 +142,6 @@
			}
			rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
			.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));

			}

			@Scheduled(fixedDelay = 1000)
			@@ -161,7 +160,7 @@
			}
			RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
			.in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
			RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
			RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
			int deviceId = details.getDeviceId();
			Integer taskType = task.getTaskType();
			if ("1".equals(value)) {
			@@ -299,7 +298,7 @@
			}
			//生成复位任务

			rawGlassStorageDetailsService.generateTask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
			// rawGlassStorageDetailsService.generatask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);

			// List<ReadWriteEntity> list = new ArrayList<>();
			// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
			@@ -377,7 +376,6 @@
			log.info("没有可用的上片位");
			return Boolean.FALSE;
			}


			List<RawGlassStorageDetails> loadStationList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
			.inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1")
			@@ -534,24 +532,6 @@
			}
			}
			}

			private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
			RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
			RawGlassStorageStation station = rawGlassStorageStationService.getOne(new LambdaQueryWrapper<RawGlassStorageStation>()
			.eq(RawGlassStorageStation::getSlot, targetSlot));
			targetDetails.setDeviceId(station.getDeviceId());
			targetDetails.setSlot(targetSlot);
			targetDetails.setShelf(details.getShelf());
			targetDetails.setPatternWidth(details.getPatternWidth());
			targetDetails.setPatternHeight(details.getPatternHeight());
			targetDetails.setPatternThickness(details.getPatternThickness());
			targetDetails.setFilmsId(details.getFilmsId());
			targetDetails.setRemainQuantity(details.getRemainQuantity());
			targetDetails.setCreateTime(new Date());
			targetDetails.setState(Const.RAW_GLASS_STATE_IN);
			return targetDetails;
			}


			private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
			ReadWriteEntity readWriteEntity = new ReadWriteEntity();