YiWuProject.git

			@@ -164,10 +164,7 @@
			if (CollectionUtils.isNotEmpty(list)) {
			log.info("有空架子,将流程卡与架子好绑定，执行进片任务结束");
			//绑定流程卡
			downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>()
			.set(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId())
			.set(DownWorkstation::getLayer, glassInfo.getLayer())
			.eq(DownWorkstation::getWorkstationId, list.get(0).getWorkstationId()));
			downWorkstationService.updateFlowCardIdAndCount(glassInfo.getFlowCardId(), glassInfo.getLayer(), list.get(0).getWorkstationId());
			checkFlag = Boolean.TRUE;
			}
			}
			@@ -458,9 +455,7 @@
			.isNull(DownWorkstation::getFlowCardId).orderByDesc(DownWorkstation::getWorkstationId).last("limit 1"));
			if (null != emptyDownWorkstation) {
			log.info("获取到空架子信息，绑定流程卡");
			emptyDownWorkstation.setFlowCardId(downStorageCageDetails.getFlowCardId());
			emptyDownWorkstation.setLayer(downStorageCageDetails.getLayer());
			downWorkstationService.updateById(emptyDownWorkstation);
			downWorkstationService.updateFlowCardIdAndCount(downStorageCageDetails.getFlowCardId(), downStorageCageDetails.getLayer(), emptyDownWorkstation.getWorkstationId());
			endCell = emptyDownWorkstation.getWorkstationId();
			} else {
			log.info("没有空架子信息，无法绑定流程卡");
			@@ -480,8 +475,14 @@
			return Boolean.FALSE;
			}
			//更新落架玻璃数量
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("racks_number = racks_number +1"));
			if (endCell == 7) {
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("other_number = other_number +1"));
			} else {
			downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId())
			.eq("layer", downStorageCageDetails.getLayer()).setSql("racks_number = racks_number +1"));
			}

			//生成任务信息
			DownGlassInfo downGlassInfo = new DownGlassInfo();
			BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
			@@ -503,7 +504,7 @@
			downGlassTask.setHeight((int) glassInfo.getHeight());
			downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
			downGlassTask.setLayer(glassInfo.getLayer());
			downGlassTask.setTaskStauts(0);
			downGlassTask.setTaskStatus(0);
			downGlassTask.setCreateTime(new Date());
			downGlassTaskService.save(downGlassTask);
			//向plc发送命令