From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期四, 09 五月 2024 15:49:34 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java index e09fb31..577e794 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java @@ -1,9 +1,7 @@ package com.mes.edgstoragecage.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.github.yulichang.base.MPJBaseService; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; -import com.mes.pp.entity.OptimizeDetail; import java.util.List; import java.util.Map; @@ -39,5 +37,19 @@ */ List<Map<String, Object>> selectCurrentCutTerritory(String current); + /** + * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿 + * @param glassId + * @param poor + * @return + */ + EdgStorageCageDetails selectConformGlass(String glassId, int poor); + /** + * 鑾峰彇鍑虹墖淇℃伅鏁版嵁 + * @param glassId + * @param poor + * @return + */ + EdgStorageCageDetails selectOutGlass(String glassId, int poor); } -- Gitblit v1.8.0