派生自 HangZhouMes
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/controller/GlassInfoController.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/temperingglass/controller/GlassInfoController.java @@ -1,4 +1,4 @@ package com.mes.temperingglass.controller; package com.mes.glassinfo.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/temperingglass/entity/GlassInfo.java @@ -1,11 +1,12 @@ package com.mes.temperingglass.entity; package com.mes.glassinfo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/temperingglass/mapper/GlassInfoMapper.java @@ -1,7 +1,7 @@ package com.mes.temperingglass.mapper; package com.mes.glassinfo.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.temperingglass.entity.GlassInfo; import com.mes.glassinfo.entity.GlassInfo; /** * <p> hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/temperingglass/service/GlassInfoService.java @@ -1,7 +1,7 @@ package com.mes.temperingglass.service; package com.mes.glassinfo.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.temperingglass.entity.GlassInfo; import com.mes.glassinfo.entity.GlassInfo; /** * <p> hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
File was renamed from hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/temperingglass/service/impl/GlassInfoServiceImpl.java @@ -1,9 +1,9 @@ package com.mes.temperingglass.service.impl; package com.mes.glassinfo.service.impl; import com.mes.temperingglass.entity.GlassInfo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.temperingglass.mapper.GlassInfoMapper; import com.mes.temperingglass.service.GlassInfoService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; import com.mes.glassinfo.service.GlassInfoService; import org.springframework.stereotype.Service; /** hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -70,7 +70,6 @@ return Result.build(200,"成功",h); } @GetMapping("/SelectEdgTask") //磨边任务 @ResponseBody public Result SelectEdgTask(String ProcessId) { hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/EdgStorageCage.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/EdgStorageCageDetails.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/Engineering.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/GlassFilms.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/GlassInfo.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/mapper/HangzhouMesMapper.java
@@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import com.mes.taskcache.entity.EdgStorageCageDetails; import com.mes.taskcache.entity.GlassInfo; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.glassinfo.entity.GlassInfo; import com.mes.taskcache.entity.TaskCache; import org.apache.ibatis.annotations.*;
@@ -1,7 +1,7 @@ package com.mes.taskcache.service; import com.mes.taskcache.entity.GlassInfo; import com.mes.glassinfo.entity.GlassInfo; import com.mes.taskcache.mapper.HangzhouMesMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
@@ -5,8 +5,8 @@ import com.mes.common.PLCAutoMes; import com.mes.common.PlcParameterObject; import com.mes.common.S7object; import com.mes.taskcache.entity.EdgStorageCageDetails; import com.mes.taskcache.entity.GlassInfo; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.glassinfo.entity.GlassInfo; import com.mes.taskcache.mapper.HangzhouMesMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,14 +40,14 @@ PlcParameterObject plcmes= PLCAutoMes.PlcMesObject; if(GlassInfo!=null){//存在此玻璃编号 //同钢化版图内的栅格号 List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth()); List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getTemperingFeedSequence(),GlassInfo.getWidth()); //空栅格号 if (list.size()==0) { list=hangzhouMesMapper.selectCacheLeisure(); } //小于此玻璃钢化版图序号的栅格号 if(list.size()==0){ list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth()); list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getWidth()); } if(list.size()>0){ //存在空格
