YiWuProject.git

			@@ -1,34 +1,23 @@
			package com.mes.job;

			import cn.hutool.core.collection.CollectionUtil;
			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.mes.common.S7object;
			import com.mes.common.config.Const;
			import com.mes.device.PlcParameterObject;
			import com.mes.downglassinfo.entity.DownGlassInfo;
			import com.mes.downglassinfo.mapper.DownGlassInfoMapper;
			import com.mes.downglassinfo.entity.DownGlassTask;
			import com.mes.downglassinfo.service.DownGlassInfoService;
			import com.mes.downstorage.entity.DownStorageCage;
			import com.mes.downglassinfo.service.DownGlassTaskService;
			import com.mes.downstorage.entity.DownStorageCageDetails;
			import com.mes.downstorage.service.DownStorageCageDetailsService;
			import com.mes.downstorage.service.DownStorageCageService;
			import com.mes.downworkstation.entity.DownWorkstation;
			import com.mes.downworkstation.entity.DownWorkstationTask;
			import com.mes.downworkstation.service.DownWorkstationService;
			import com.mes.downworkstation.service.DownWorkstationTaskService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.downglassinfo.entity.DownGlassTask;
			import com.mes.downglassinfo.service.DownGlassTaskService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import java.util.Date;
			import java.util.List;

			/**
			@@ -63,7 +52,7 @@
			// @Value("${mes.threshold}")
			private int threshold;

			// @Scheduled(fixedDelay = 1000)
			// @Scheduled(fixedDelay = 1000)
			public void plcdownGlassTask() {
			// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			// String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
			@@ -74,14 +63,14 @@
			// String G06RobotTaskRequestWord = plcParameterObject.getPlcParameter("G06RobotTaskRequestWord").getAddress();


			String taskRequestTypeValue ="3";
			String taskRequestTypeValue ="0";
			String glassIdeValue ="NG24041101C002-2-6-1-6";
			String confirmationWrodValue ="1";
			String outGlassstate="1";
			String confirmationWrodAddress="1";
			String G11RobotTaskRequestWord ="1";
			String G06RobotTaskRequestWord ="1";
			String G13RobotTaskRequestWord ="1";
			String G11RobotTaskRequestWord ="0";
			String G06RobotTaskRequestWord ="0";
			String G13RobotTaskRequestWord ="0";

			log.info("1、获取到的请求字为：{}，获取到的扫描ID为：{}，获取到的确认字为：{}，获取到的出片状态为：{}",
			taskRequestTypeValue, glassIdeValue, confirmationWrodValue, outGlassstate);
			@@ -127,6 +116,8 @@





			}

			/**
			@@ -143,6 +134,18 @@
			return;
			}
			log.info("2、获取到的玻璃信息为{}", glassInfo);

			if (glassInfo.getGlassId().equals(downStorageCageDetailsService.DirectConnection()) ) {
			//直通
			log.info("3、如果当前玻璃属于版图id和片序的顺序则直通，执行下片任务");
			DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
			int WorkstationId=downWorkstation.getWorkstationId();
			DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", String.valueOf(WorkstationId), "3");
			downGlassTaskService.insertCacheTask(downGlassTask);

			}else{

			log.info("4、如果不属于版图id和片序的顺序执行进片任务");
			//添加进片任务查找空格
			List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
			if(list.size()>0){
			@@ -150,8 +153,8 @@



			log.info("3、查询卧式理片笼里面的空格:{}", list);
			log.info("4、将玻璃信息插入卧式理片笼,当前玻璃信息:{}", glassInfo);
			log.info("5、查询卧式理片笼里面的空格:{}", list);
			log.info("6、将玻璃信息插入卧式理片笼,当前玻璃信息:{}", glassInfo);
			DownStorageCageDetails details = new DownStorageCageDetails();
			BeanUtils.copyProperties(glassInfo, details);
			details.setState(1);
			@@ -159,17 +162,19 @@
			details.setSlot(item.getSlot());
			details.setDeviceId(item.getDeviceId());
			downStorageCageDetailsService.save(details);
			log.info("5、玻璃信息已存入理片笼详情表，玻璃信息为{}", details);
			log.info("7、玻璃信息已存入理片笼详情表，玻璃信息为{}", details);

			DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", item.getSlot() + "", "1");
			//添加进片任务
			log.info("6、生成进片任务信息存入任务表{}", downGlassTask);
			log.info("8、生成进片任务信息存入任务表{}", downGlassTask);
			downGlassTaskService.insertCacheTask(downGlassTask);
			}



			}
			log.info("9、发送确认字完成");
			//S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
			log.info("7、发送确认字完成");


			}

			/**