Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java

@@ -1,9 +1,7 @@
package com.mes.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.order.entity.HollowGlassDetailsDTO;
import com.mes.order.entity.HollowOrderDTO;
import com.mes.order.entity.OrderDetailsDTO;
import com.mes.order.entity.Orders;
import com.mes.order.entity.*;
import com.mes.order.entity.dto.InterlayerDTO;
import com.mes.order.entity.dto.OrderDTO;

import java.util.List;
@@ -27,4 +25,13 @@
    List<HollowGlassDetailsDTO> queryFlowCardIdLayerGlassInfo(String flowCardId, int totalLayer, int layer);

    OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId);

    List<ProcessCardReport> queryLackByERP(String flowCardId);

    /**
     * 按照流程卡查询是否夹层及层号
     * @param flowCardId
     * @return
     */
    List<InterlayerDTO> queryInterlayerByERP(String flowCardId);
}