From 0ea37bbf8ac1e1dc3be1ecb1f04a507d65af8aca Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 30 七月 2024 10:09:36 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 213 insertions(+), 80 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java index f909c54..71f65e2 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java @@ -2,28 +2,41 @@ 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.toolkit.CollectionUtils; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.entity.BigStorageDTO; +import com.mes.bigstorage.entity.dto.SlotSequenceDTO; import com.mes.bigstorage.entity.dto.TemperingLayoutDTO; import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper; 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.entity.UpdateBigStorageCageDTO; import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper; import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper; import com.mes.common.config.Const; +import com.mes.common.utils.RedisUtil; +import com.mes.damage.entity.Damage; +import com.mes.damage.service.DamageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; +import com.mes.glassinfo.service.GlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; +import com.mes.temperingglass.service.TemperingGlassInfoService; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,36 +63,62 @@ @Resource private GlassInfoMapper glassInfoMapper; - /** - * 鏌ヨ杩�/鍑虹墖浠诲姟 - */ + @Resource + private GlassInfoService glassInfoService; + + @Resource + private TemperingGlassInfoService temperingGlassInfoService; + + @Resource + private DamageService damageService; + @Resource + private RedisUtil redisUtil; + + @Value("${mes.minCount}") + private int minCount; + + @Value("${mes.slotWidth}") + private Integer slotWidth; + + @Value("${mes.glassGap}") + private Integer glassGap; + + @Value("${mes.sequence.order}") + private boolean sequenceOrder; + + @Override - public List<BigStorageCageDetails> selectTask(int taskType) { - if (taskType == 1) { - //杩涚墖浠诲姟鏁版嵁 - LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>(); - feedWrapper.eq(BigStorageCageDetails::getState, 1) - .or() - .eq(BigStorageCageDetails::getState, 2); - List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper); - List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(null); + public List<BigStorageCageDetails> selectFeedTask(){ + //杩涚墖浠诲姟鏁版嵁 + LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>(); + feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN); + List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper); - Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream() - .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task)); - - for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) { + LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>(); + feedTaskWrapper + .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT) + .isNotNull(BigStorageCageFeedTask::getTargetSlot); + List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper); + Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream() + .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task)); + Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator(); + while (iterator.hasNext()) { + BigStorageCageDetails bigStorageCageDetails = iterator.next(); BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId()); bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask); } return bigStorageCageDetailsList; - } else { - //鍑虹墖浠诲姟鏁版嵁 + } + + @Override + public List<BigStorageCageDetails> selectOutTask(){ LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>(); - outWrapper.eq(BigStorageCageDetails::getState, 3) - .or() - .eq(BigStorageCageDetails::getState, 4); + outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN); List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper); - List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(null); + + LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>(); + outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS); + List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper); Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream() .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task)); @@ -87,9 +126,14 @@ BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId()); bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask); } + Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator(); + while (iterator.hasNext()) { + BigStorageCageDetails bigStorageCageDetails = iterator.next(); + BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId()); + bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask); + } return bigStorageCageDetailsList; } - } /** @@ -117,7 +161,7 @@ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList ) { if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) { - carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap(); + carWidth = carWidth - bigStorageCageDetails.getWidth() - glassGap; } } return carWidth; @@ -134,7 +178,8 @@ //鐞嗙墖绗艰鎯呯牬鎹� @Override - public void damageBigStorageCageDetails(String glassId) { + public void damageBigStorageCageDetails(String glassId, int status) { + LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>(); temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId); TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper); @@ -143,34 +188,54 @@ bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId); BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper); - if (temperingGlassInfo.getState() == -2) { - temperingGlassInfoMapper.deleteById(temperingGlassInfo); - } else { - temperingGlassInfo.setState(5); + if (temperingGlassInfo != null) { + if (status == 0) { + temperingGlassInfo.setState(Const.TEMPERING_DAMAGE); + } else { + temperingGlassInfo.setState(Const.TEMPERING_TAKE); + } temperingGlassInfoMapper.updateById(temperingGlassInfo); } - baseMapper.deleteById(bigStorageCageDetails.getId()); + if (status == 0) { + bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE); + } else { + bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE); + } + baseMapper.updateById(bigStorageCageDetails); bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot()); //todo:鎻掑叆鐮存崯鏁版嵁 - + Damage damage = new Damage(); + damage.setGlassId(bigStorageCageDetails.getGlassId()); + damage.setWorkingProcedure("鍐峰姞宸�"); + damage.setRemark("澶х悊鐗囩鐮存崯"); + damage.setStatus(2); + damageService.insertDamage(damage); } //鏌ヨ鐜荤拑淇℃伅 @Override - public BigStorageCageDetails selectBigStorageCageDetails(String glassId) { + public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) { LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>(); glassInfoWrapper.eq(GlassInfo::getGlassId, glassId); GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper); BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails(); - BeanUtils.copyProperties(glassInfo, bigStorageCageDetails); - bigStorageCageDetails.setState(0); - bigStorageCageDetails.setGap(20); - return bigStorageCageDetails; + if (glassInfo != null) { + BeanUtils.copyProperties(glassInfo, bigStorageCageDetails); + bigStorageCageDetails.setState(1); + bigStorageCageDetails.setGap(glassGap); + List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>(); + bigStorageCageDetailsList.add(bigStorageCageDetails); + return bigStorageCageDetailsList; + } else { + return null; + } + } //鐞嗙墖绗艰鎯呮坊鍔� @Override public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + bigStorageCageDetails.setState(100); baseMapper.insert(bigStorageCageDetails); bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot()); } @@ -178,62 +243,50 @@ //鐞嗙墖绗艰鎯呭畬鎴� @Override public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { - if (bigStorageCageDetails.getState() == 1 || bigStorageCageDetails.getState() == 2) { - bigStorageCageDetails.setState(0); - baseMapper.updateById(bigStorageCageDetails); - bigStorageCageFeedTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageFeedTask().getId()); - } else { - baseMapper.deleteById(bigStorageCageDetails.getId()); - bigStorageCageOutTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageOutTask().getId()); - } - +// if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) { +// bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE); +// baseMapper.updateById(bigStorageCageDetails); +// } else { +// bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE); +// baseMapper.updateById(bigStorageCageDetails); +// bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot()); +// } } //鎵嬪姩鍑虹墖 @Override public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { - LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>(); - temperingGlassInfoWrapper - .eq(TemperingGlassInfo::getGlassId, bigStorageCageDetails.getGlassId()); - TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper); - if (temperingGlassInfo.getGlassId() == null) { - LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>(); - glassInfoWrapper - .eq(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId()); - GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper); - TemperingGlassInfo temperingGlassInfo1 = new TemperingGlassInfo(); - BeanUtils.copyProperties(glassInfo, temperingGlassInfo1); - - if (temperingGlassInfo.getTemperingLayoutId() != null) { - temperingGlassInfo1.setState(-1); - } else { - temperingGlassInfo1.setState(-2); - } - temperingGlassInfoMapper.insert(temperingGlassInfo1); - } + bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL); + baseMapper.updateById(bigStorageCageDetails); } @Override public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) { -// MPJLambdaWrapper<BigStorageDTO> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class) -// .selectAll(BigStorageDTO.class) -// .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot) -// .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) -// .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1) -// .last("limit 1"); BigStorageDTO bigStorageDTO = null; MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class) - .selectAsClass(BigStorageCage.class, BigStorageDTO.class) + .selectAll(BigStorageCage.class) .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot) + .eq(BigStorageCage::getEnableState, Const.SLOT_ON) .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) - .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1) + .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight())) .last("limit 1"); - bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper); - if (null != bigStorageDTO) { + if (glassInfo.getTemperingLayoutId() == 0) { + wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight()); + } else { + wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1); + } + BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper); + if (null != bigStorageCage) { + bigStorageDTO = new BigStorageDTO(); + bigStorageDTO.setWidth(bigStorageCage.getRemainWidth()); + bigStorageDTO.setSlot(bigStorageCage.getSlot()); + bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId()); return bigStorageDTO; } - BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() - .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH) + bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() + .eq(BigStorageCage::getEnableState, Const.SLOT_ON) + .eq(BigStorageCage::getRemainWidth, slotWidth) + .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0") .inSql(BigStorageCage::getDeviceId, "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId()) .last("limit 1")); @@ -241,22 +294,102 @@ bigStorageDTO = new BigStorageDTO(); bigStorageDTO.setWidth(bigStorageCage.getRemainWidth()); bigStorageDTO.setSlot(bigStorageCage.getSlot()); + bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId()); + return bigStorageDTO; + } + + //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨 + bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() + .eq(BigStorageCage::getRemainWidth, slotWidth) + .eq(BigStorageCage::getEnableState, Const.SLOT_ON) + .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0") + .notInSql(BigStorageCage::getDeviceId, + "select distinct device_id from big_storage_cage_details where state in (100,102,103)") + .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness()) + .orderByAsc(BigStorageCage::getDeviceId) + .last("limit 1")); + if (null != bigStorageCage) { + bigStorageDTO = new BigStorageDTO(); + bigStorageDTO.setWidth(bigStorageCage.getRemainWidth()); + bigStorageDTO.setSlot(bigStorageCage.getSlot()); + bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId()); return bigStorageDTO; } bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>() - .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH) + .eq(BigStorageCage::getRemainWidth, slotWidth) + .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0") + .eq(BigStorageCage::getEnableState, Const.SLOT_ON) + .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness()) + .orderByAsc(BigStorageCage::getDeviceId) .last("limit 1")); Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�"); bigStorageDTO = new BigStorageDTO(); bigStorageDTO.setWidth(bigStorageCage.getRemainWidth()); bigStorageDTO.setSlot(bigStorageCage.getSlot()); + bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId()); return bigStorageDTO; - - } @Override - public TemperingLayoutDTO temperingIsAll() { + public List<TemperingLayoutDTO> temperingIsAll() { return baseMapper.temperingIsAll(); } + + + @Override + public List<TemperingLayoutDTO> queryTemperingOccupySlot() { + return baseMapper.queryTemperingOccupySlot(minCount); + } + + @Override + public List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId) { + return baseMapper.queryGlassMaxAndMin(engineerId, temperingLayoutId); + } + + @Override + public boolean temperingGlass(String temperingLayoutId, String engineerId) { + LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + temperingGlassInfoLambdaQueryWrapper + .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW); + List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper); + + if (temperingGlassInfoList.size() == 0) { + List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class) + .selectAll(GlassInfo.class) + .select("-1 as state") + .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot) + .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId) + .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId) + .eq(GlassInfo::getEngineerId, engineerId) + .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN) + .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)); + if (CollectionUtils.isNotEmpty(temperingGlassInfos)) { + temperingGlassInfoService.saveBatch(temperingGlassInfos); + return true; + } + } + return false; + } + + + @Override + public List<Map<String, Object>> selectTemperingGlass() { + QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>(); + wrapper.select("engineer_id,tempering_layout_id,count(*) as count") + .in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL) + .groupBy("engineer_id,tempering_layout_id"); + List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper); + return TemperingGlass; + } + + @Override + public void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state) { + baseMapper.updateBySlot(glassList, state); + } + + @Override + public String temperingSwitch(Boolean flag) { + redisUtil.setCacheObject("temperingSwitch", flag); + return "success"; + } } -- Gitblit v1.8.0