From f79e68601719d4ad1c37f486c74fced55eeed269 Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期五, 24 五月 2024 08:22:28 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java index 053491a..c0126b4 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java @@ -148,6 +148,7 @@ private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) { log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅,褰撳墠鏍煎瓙涓�:{}", glassId, currentSlot); GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId)); + //TODO: 鏌ヨ鐜荤拑 if (glassInfo == null) { log.info("2銆佹鐜荤拑缂栧彿涓嶅瓨鍦�"); return; @@ -278,6 +279,7 @@ private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) { List<EdgStorageCageDetails> glassList = new ArrayList<>(); //鑾峰彇寰呰繘鐗囩幓鐠� + //todo: 鑾峰彇姝e湪鎵ц鐨勫伐绋嬩俊鎭� if (StringUtils.isNotBlank(glassId)) { GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>() .eq(GlassInfo::getGlassId, glassId)); -- Gitblit v1.8.0