From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
index e00a7c8..e783a1d 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/OrdersService.java
@@ -1,9 +1,7 @@
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.OrderDTO;
import java.util.List;
@@ -23,4 +21,12 @@
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);
}
--
Gitblit v1.8.0