Merge remote-tracking branch 'origin/master'

wu

2024-08-02 928fa3682fcd0bcb59e3ca3da8770ecbb06cf315

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java

@@ -5,6 +5,7 @@
import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;
@@ -20,7 +21,9 @@
 */
public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {

    List<BigStorageCageDetails> selectTask(int taskType);
    List<BigStorageCageDetails> selectFeedTask();

    List<BigStorageCageDetails> selectOutTask();

    double selectGetBoard(String plcFeedReqLine);

@@ -55,7 +58,7 @@
     *
     * @return
     */
    TemperingLayoutDTO queryTemperingOccupySlot();
    List<TemperingLayoutDTO> queryTemperingOccupySlot();

    /**
     * 获取版图每个格子的最大最小序号
@@ -66,7 +69,11 @@
     */
    List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId);

    boolean TemperingGlass(String temperingLayoutId, String engineerId);
    boolean temperingGlass(String temperingLayoutId, String engineerId);

    List<Map<String, Object>> selectTemperingGlass();

    void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state);

    String temperingSwitch(Boolean flag);
}