1、解决冲突

zhoushihao

2024-08-06 54aeb39206453ccfd2d1c89fe4f9def88b2c985c

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java

@@ -65,11 +65,14 @@
//     * @return 直通查询
//     */
//    List<GlassInfo>  DirectConnection();

    /**
     * @return 直通查询
     */
    boolean DirectConnection(GlassInfo glassInfo);

    String getGlassInfoMaxCount(String glassId, List<Integer> workList);

    /**
     * @param glassId
     * @param ControlsId