From c6ca78efd59710d1564aca05f70d2197f68feb4b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 19 三月 2025 15:59:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 3015522..77f5143 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
@@ -16,10 +16,10 @@
@Mapper
public interface FlowCardMapper extends BaseMapper<FlowCard> {
//娴佺▼鍗＄鐞嗘煡璇�
- List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCard(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗛〉鏌ヨ
- Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, FlowCard flowCard);
+ Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
@@ -241,4 +241,6 @@
List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
Boolean updatePrintNumberMp(String processId, Integer orderNumber);
+
+ String getOrderIdByProcessId(String processId);
}
--
Gitblit v1.8.0