YiWuProject.git

			@@ -1,18 +1,15 @@
			package com.mes.component;

			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
			import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
			import com.mes.edgstoragetask.service.TaskCacheService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;

			@@ -62,11 +59,11 @@
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
			log.info("2、根据玻璃id获取玻璃信息"+glassInfo);
			BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
			if (SlotInfo != null) {
			BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
			if (slotInfo != null) {
			int taskType=taskCacheService.judgeTasktype();
			log.info("3、查询任务表判断当前任务类型为上车等到还是上车启动"+taskType);
			bigStorageCageFeedTaskService.addFeedTask(SlotInfo,Integer.parseInt(plcFeedReqLine),taskType);
			bigStorageCageFeedTaskService.addFeedTask(slotInfo,Integer.parseInt(plcFeedReqLine),taskType);
			log.info("4、添加任务到任务表");
			//plc任务发送字1
			bigStorageCageFullAlarm=false;
			@@ -95,7 +92,7 @@
			if ("1".equals(plcOutReq)) {
			result=bigStorageCageService.outGlass();
			log.info("8、出片请求时调用出片接口"+result);
			if (result == true) {
			if (result) {
			//plc任务发送字1
			}
			}else{

	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/component/PlcStorageCage.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -7,8 +7,10 @@
			import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
			import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import net.bytebuddy.matcher.FilterableList;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;

			/**

			@@ -52,7 +52,7 @@

			@Override
			public void deleteOutTask(Long taskId){
			log.info("根据任务id修改钢化小片表状态，删除已完成的出片任务");
			log.info("根据任务id修改钢化小片表状态，删除已完成的出片任务,删除笼子表玻璃");
			temperingGlassInfoMapper.deleteById(taskId);
			bigStorageCageOutTaskMapper.deleteById(taskId);
			bigStorageCageDetailsMapper.deleteById(taskId);