From c823892f961b266199731ddd365d2dd4af4bf382 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 03 十二月 2024 08:50:27 +0800 Subject: [PATCH] 1、中空线初步版本,待优化 2、fixbug 钢化后摆片顺序错乱 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java index dd93257..bd6e1b0 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java @@ -4,8 +4,10 @@ import cn.hutool.json.JSONObject; 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.fasterxml.jackson.databind.ObjectMapper; import com.mes.bigstorage.entity.BigStorageCage; +import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper; @@ -194,6 +196,41 @@ } @Test + public void deleteByGlassId(){ + damageService.deleteByGlassId("P24081203|2|5"); + } + + @Test + public void testttt(){ + List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6); + List<Integer> deviceUseds = deviceUsedList; + List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list( + new LambdaQueryWrapper<BigStorageCageDetails>() + .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE) + .select(BigStorageCageDetails::getEngineerId) + .groupBy(BigStorageCageDetails::getEngineerId) + .between(BigStorageCageDetails::getDeviceId, 1, 5) + ); + List<BigStorageCageDetails> engineerCount2 = bigStorageCageDetailsService.list( + new LambdaQueryWrapper<BigStorageCageDetails>() + .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE) + .select(BigStorageCageDetails::getEngineerId) + .groupBy(BigStorageCageDetails::getEngineerId) + .between(BigStorageCageDetails::getDeviceId, 6, 8) + ); + if (engineerCount1.size() > engineerCount2.size()) { + deviceUsedList.removeIf(device -> device < 6); + } else { + deviceUsedList.removeIf(device -> device > 5); + } + if (CollectionUtils.isEmpty(deviceUsedList)) { + deviceUsedList = deviceUseds; + } + log.info("zhi:{}",deviceUsedList); + } + + + @Test public void ca(){ try { // 鐩爣绯荤粺鐨凙PI URL -- Gitblit v1.8.0