Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-11-12 ae1459d90f53ac81177e75790d859c6a12e7ed54

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java

@@ -3,9 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.HollowGlassDetailsDTO;
import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.entity.dto.OrderDetailsDTO;
import com.mes.order.entity.ProcessCardReport;
import org.apache.ibatis.annotations.Param;
import org.springframework.cache.annotation.Cacheable;

@@ -20,27 +19,18 @@
public interface HollowGlassRelationInfoMapper extends BaseMapper<HollowGlassRelationInfo> {


    List<HollowGlassDetailsDTO> queryFlowCardIdMaxLayerGlassInfo(@Param("flowCardId") String flowCardId, @Param("totalLayer") int totalLayer);


    List<HollowGlassDetailsDTO> queryFlowCardIdLayerGlassInfo(@Param("flowCardId") String flowCardId, @Param("totalLayer") int totalLayer, @Param("layer") int layer);

    List<LackDetailsDTO> queryAllLackByFlowCard();
    
    List<LackDetailsDTO> queryLackByFlowCard();

    int queryLayerByFlowCardId(@Param("flowCardId") String flowCardId);

    void clearDirtyFlowCardData(@Param("flowCardId") String flowCardId, @Param("layer") int layer);

    /**
     * 按照流程卡获取产品名称
     *
     * @param flowCardId
     * @return
     */
    OrderDetailsDTO queryProductNameByFlowCardId(@Param("flowCardId") String flowCardId, @Param("productName") String productName, @Param("customerName") String customerName);

    List<LackDetailsDTO> queryLackByFlowCard(@Param("flowCardId")  String flowCardId);

    List<GlassInfo> queryLackGlassByFlowCard(@Param("flowCardId") String flowCardId, @Param("orderSort") Integer orderSort, @Param("layer") Integer layer);
    List<LackDetailsDTO> queryLackGlassByFlowCard(@Param("flowCardId") String flowCardId, @Param("orderSort") Integer orderSort, @Param("layer") Integer layer);

    List<LackDetailsDTO> queryLackByFlowCardByERP(@Param("flowCardIdList") List<ProcessCardReport> flowCardIdList);
}