hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -1,8 +1,10 @@ package com.mes.glassinfo.service; import com.github.yulichang.base.MPJBaseService; import com.mes.engineering.entity.Engineering; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO; import com.mes.uppattenusage.entity.UpPattenUsage; import java.util.List; import java.util.Map; @@ -37,5 +39,7 @@ List<HollowGlassInfoDTO> listBySize(String engineerId); void deleteTask(String engineerId); List<GlassInfo> selectEdgGlassInfo(String engineering); }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.engineering.entity.Engineering; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.OptimizeGlassinfo; import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO; @@ -11,14 +12,12 @@ import com.mes.glassinfo.service.GlassInfoService; import com.mes.pp.entity.OptimizeProject; import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.uppattenusage.entity.UpPattenUsage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; /** @@ -150,5 +149,18 @@ baseMapper.delete(queryWrapper); } @Override public List<GlassInfo> selectEdgGlassInfo(String engineeringId) { List<GlassInfo> glassInfos = null; if (engineeringId != null) { glassInfos = baseMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>() .select("t.*") .leftJoin("edg_storage_cage_details b on t.engineer_id=b.engineer_id and t.glass_id=b.glass_id") .isNull("b.glass_id") .eq("t.engineer_id", engineeringId)); } return glassInfos; } } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
@@ -102,7 +102,10 @@ if (null == relationInfoBefore) { //表示序号没有或者 序号为1又不是第一块来的 新开一格 storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot).last("limit 1")); .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth) .ge(BigStorageCage::getMaxThickness, bigStorageCageDetails.getThickness()) .orderByAsc(BigStorageCage::getMaxThickness) .orderByAsc(BigStorageCage::getSlot).last("limit 1")); } else { BigStorageCageDetails beforeGlass = bigStorageCageDetailsService.getOne(new LambdaQueryWrapper<BigStorageCageDetails>() .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO) @@ -112,7 +115,9 @@ ); if (null == beforeGlass) { storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot).last("limit 1")); .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth) .ge(BigStorageCage::getMaxThickness, bigStorageCageDetails.getThickness()) .orderByAsc(BigStorageCage::getMaxThickness).orderByAsc(BigStorageCage::getSlot).last("limit 1")); } else { storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getSlot, beforeGlass.getSlot())); @@ -173,7 +178,9 @@ public int bigStorageSlotPair(BigStorageGlassInfo bigStorageGlassInfo) { //获取所有空闲可用的格子号 BigStorageCage storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot).last("limit 1")); .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth) .ge(BigStorageCage::getMaxThickness,bigStorageGlassInfo.getThickness()) .orderByAsc(BigStorageCage::getMaxThickness).orderByAsc(BigStorageCage::getSlot).last("limit 1")); Assert.isTrue(null != storageCage, "没有空余的笼子存放玻璃"); Integer slot = storageCage.getSlot(); //获取该工程同一流程卡同一车的玻璃信息 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -36,6 +36,7 @@ private GlassInfoService glassInfoService; @Autowired private OptimizeProjectService optimizeProjectService; @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0") @PostMapping("/pauseTask") //暂停上片任务 @ResponseBody @@ -100,17 +101,16 @@ @ApiOperation("删除工程上片") @PostMapping("/deleteTask") //调用上片任务 @ResponseBody public Result <Boolean> deleteTask(@RequestBody Engineering engineering) { public Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) { //删除工程表、小片表、上片表，更改优化表状态 boolean work=engineeringService.deleteTask(engineering.getEngineerId()); glassInfoService.deleteTask(engineering.getEngineerId()); upPattenUsageService.deleteTask(engineering.getEngineerId()); optimizeProjectService.changeTask(engineering.getEngineerId(), 100); if (work) { return Result.build(200, "删除成功"+engineering.getEngineerId(), true); }else { return Result.build(200, "删除失败"+engineering.getEngineerId(), false); } // boolean work=engineeringService.deleteTask(engineering.getEngineerId()); // glassInfoService.deleteTask(engineering.getEngineerId()); // upPattenUsageService.deleteTask(engineering.getEngineerId()); // optimizeProjectService.changeTask(engineering.getEngineerId(), 100); //查询未上片的小片信息 List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId()); return Result.build(200, "删除成功"+engineering, glasslist); }
@@ -74,5 +74,7 @@ UpPattenUsage selectedEngineering(String engineerId); void deleteTask(String engineerId); }
@@ -166,6 +166,11 @@ List<UpPattenUsage> list=upPattenUsageService.selectSaveUpPattenUsage("P24062706"); System.out.println("工程："+list); } @Test public void test9() { //获取未到磨边表的小片信息 List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo("P24120201"); System.out.println("工程："+glasslist); } } hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -64,7 +64,7 @@ .eq(HollowGlassRelationInfo::getWidth, width) .eq(HollowGlassRelationInfo::getHeight, height) .eq(HollowGlassRelationInfo::getLayer, layer) .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW) .eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW) .orderByAsc(HollowGlassRelationInfo::getHollowSequence) .last("limit 1") ); @@ -77,7 +77,7 @@ .eq(HollowGlassRelationInfo::getWidth, width) .eq(HollowGlassRelationInfo::getHeight, height) .eq(HollowGlassRelationInfo::getLayer, layer) .eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW) .eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW) .orderByAsc(HollowGlassRelationInfo::getHollowSequence) .last("limit 1") ); @@ -91,7 +91,9 @@ HollowBigStorageCage storageCage = null; if (null == hollowDetails) { storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>() .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1")); .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth) .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()) .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1")); HollowBigStorageDTO storageDTO = new HollowBigStorageDTO(); BeanUtils.copyProperties(storageCage, storageDTO); BeanUtils.copyProperties(relationInfoOne, storageDTO); @@ -105,7 +107,8 @@ if (null == relationInfoBefore) { //表示序号没有或者 序号为1又不是第一块来的 新开一格 storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>() .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1")); .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth) .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()).orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1")); } else { HollowBigStorageCageDetails beforeGlass = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>() .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO) @@ -115,7 +118,9 @@ ); if (null == beforeGlass) { storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>() .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth).last("limit 1")); .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth) .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()) .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1")); } else { storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>() .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getSlot, beforeGlass.getSlot())); @@ -245,14 +250,14 @@ return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId)); } // @Override // @Override // public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) { // List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId); // Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer)); // return listMap; // } @Override public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) { public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) { List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId); return lackDetailsList; }
