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/service/OrdersService.java | 20 +++++++++++++++++---
1 files changed, 17 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 90702fa..5397dbe 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,9 @@
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;
@@ -20,4 +20,18 @@
List<Orders> selectOrders();
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);
}
--
Gitblit v1.8.0