Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java

@@ -1,9 +1,8 @@
package com.mes.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.order.entity.Order;
import com.mes.order.entity.Orderdetail;
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;
@@ -23,4 +22,16 @@
    List<Orderdetail> selectOrderdetail(Orders orders);

    List<OrderDTO> selectOrderPercent();

    HollowOrderDTO queryOrderByFlowCardId(String flowCardId);

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

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

    OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId);

    List<ProcessCardReport> queryLackByERP(String flowCardId);

    List<InterlayerDTO> queryInterlayerByERP(String flowCardId);
}