Merge remote-tracking branch 'origin/master'

wu

2024-08-07 dd60bcc7b38c2a19c02a20550a393987fc5a5a27

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

@@ -18,11 +18,10 @@

    /**
     * 识别 破损/拿走
     * @param glassId
     * @param ControlsId
     * @param arguments
     * @return
     */
    boolean identWorn(String glassId,int ControlsId);
    boolean identWorn(Map<String, String> arguments);

    /**
     * 获取 切割当前版图
@@ -35,7 +34,7 @@
     * @param current
     * @return
     */
    List<Map<String, Object>> selectCurrentCutTerritory(String current);
    List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);

    /**
     * 查询笼内版图差值范围内的  此尺寸玻璃  如无则按照 钢化版图序号 以及玻璃序号