From 4dc1abb37aec033fdbd09d290c6f62d082ba774a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 29 十一月 2025 17:07:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
index 5a2cdf2..1903a78 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/OrdersMapper.java
@@ -1,6 +1,7 @@
 package com.mes.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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;
@@ -16,4 +17,21 @@
 public interface OrdersMapper extends BaseMapper<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);
+
+    /**
+     * 鎸夌収娴佺▼鍗℃煡璇㈡槸鍚﹀す灞傚強灞傚彿
+     * @param flowCardId
+     * @return
+     */
+    List<InterlayerDTO> queryInterlayerByERP(String flowCardId);
 }

--
Gitblit v1.8.0