From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index d5aaccc..e0a24a1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -1,6 +1,8 @@
package com.example.erp.mapper.pp;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -9,5 +11,9 @@
@Mapper
public interface FlowCardMapper {
List<FlowCard> selectFlowCard(Date selectTime1, Date selectTime2,FlowCard flowCard);
- // Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
+
+ List<Order> selectFlowCardMp(Date selectTime1, Date selectTime2, Order order);
+
+ List<OrderDetail> DetailsSelectMp(String orderId, OrderDetail orderDetail);
+ // Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
}
--
Gitblit v1.8.0