1、冲突代码合并

ZengTao

2025-10-11 f4712cb12cc653b2aff19379fd7756fcfb478b90

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

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
import com.mes.hollow.entity.dto.HollowBigStorageDTO;
import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.entity.dto.OrderDetailsDTO;
import com.mes.order.entity.OrderDetailsDTO;
import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;

@@ -54,5 +55,7 @@
    Boolean hollowBigStorageGlassDamage(DamageRequest request);

    OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName);

    List<LackDetailsDTO> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
}