Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java

@@ -3,6 +3,7 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.edgglasstask.entity.request.IdentWornRequest;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.entity.vo.CutDrawingVO;

import java.util.List;
import java.util.Map;
@@ -20,19 +21,14 @@
//    boolean identWorn(Map<String, Object> arguments);

    /**
     * 获取 切割当前版图
     *
     * 按照设备及线路，获取当前线路正在切割的版图信息
     * @param deviceId
     * @param stationCell
     * @return
     */
    List<Map<String, Object>> selectCutTerritory();
    List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell);

    /**
     * 获取 工程下的当前版图
     *
     * @param current
     * @return
     */
    List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);
    Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence);

    /**
     * 获取 工程下的钢化版图