YiWuProject.git

			@@ -2,6 +2,7 @@

			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			@@ -156,6 +157,16 @@
			String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
			String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
			log.info("执行空车送片任务，获取到的大车状态为{}，卧转立状态分别为d03:{}，d05:{}", e01Status, d03ToMES, d05ToMES);
			List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
			new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.ne(BigStorageCageFeedTask::getTargetSlot, 0)
			.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
			);
			if (bigStorageCageFeedTasks.size() > 0) {
			Date endDate = new Date();
			log.info("大车有正在执行的任务{}，结束送片任务，任务结束时间：{}，共耗时：{}ms,结束扫码任务", bigStorageCageFeedTasks, endDate, endDate.getTime() - startDate.getTime());
			return;
			}
			if (REQUEST_WORD.equals(e01Status)) {
			Date endDate = new Date();
			log.info("进片大车非空闲，结束送片任务，任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			@@ -282,8 +293,12 @@
			return;
			}
			//是否有人工下片任务有直接出
			// List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
			List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
			.orderByAsc(BigStorageCageDetails::getSlot)
			.orderByDesc(BigStorageCageDetails::getId));
			if (CollectionUtils.isNotEmpty(artificialList)) {
			computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
			Date endDate = new Date();
			@@ -543,18 +558,19 @@
			*/
			public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
			//1、获取任务表中相邻玻璃
			List<EdgGlassTaskInfo> edgGlassTaskInfoList ;
			edgGlassTaskInfoList= edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
			List<EdgGlassTaskInfo> edgGlassTaskInfoList;
			edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.eq(EdgGlassTaskInfo::getLine, line)
			.apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
			.orderByAsc(EdgGlassTaskInfo::getTime));
			if(edgGlassTaskInfoList==null){
			log.info("线路：{}识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败",line);
			}else{
			edgGlassTaskInfoList= edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.eq(EdgGlassTaskInfo::getGlassId, glassId)
			.last("limit 1"));
			log.info("在尺寸表中获取玻璃信息{}",edgGlassTaskInfoList);
			if (edgGlassTaskInfoList == null) {
			log.info("线路：{}识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败", line);
			} else {
			edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
			.select("Top 1 *")
			.eq("glass_id", glassId)
			);
			log.info("在尺寸表中获取玻璃信息{}", edgGlassTaskInfoList);
			}
			Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败");
			//2、获取卧转立剩余宽度
			@@ -716,7 +732,7 @@
			for (int i = 1; i <= taskList.size(); i++) {
			s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
			s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
			log.info("向plc发送第{}片玻璃已完成", i);
			log.info("向plc发送第{}片玻璃已完成,起始位置是{}，目标位置是", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
			}
			int returnData = 0;
			int count = 1;