Merge remote-tracking branch 'origin/master'

zhoushihao

2025-09-22 d41ce9c4703807bf2607a74b8305c1d78aed4ec1

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java

@@ -1,7 +1,7 @@
package com.mes.hollow.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.common.config.ConstSysConfig;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
import com.mes.hollow.entity.dto.HollowBigStorageDTO;
@@ -24,7 +24,7 @@
     *
     * @return
     */
    HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, double width, double height, int totalLayer, int layer);
    HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, Integer glassType, double width, double height, int totalLayer, int layer);

    /**
     * 生成中空玻璃信息
@@ -35,7 +35,7 @@

    List<FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query);

    Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
    List<LackDetailsDTO> queryLackByFlowCard();

    int queryLayerByFlowCardId(String flowCardId);
//    List<LackDetailsDTO> queryLackByFlowCard(String flowCardId);
@@ -43,10 +43,12 @@

    /**
     * 按照厚度获取玻璃间隙
     *
     * @param thickness
     * @return
     */
    Integer getGlassGapByThickness(Double thickness);

    Boolean hollowBigStorageGlassDamage(DamageRequest request);
}