From 9425caa266245d82e7442f93cd47c5e263be2242 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 10 四月 2025 16:50:37 +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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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 77f5143..8f103e8 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
@@ -243,4 +243,8 @@
     Boolean updatePrintNumberMp(String processId, Integer orderNumber);
 
     String getOrderIdByProcessId(String processId);
+
+    Boolean updateFlowCardIsMerge(String processId);
+
+    Integer flowCardDetailMergeMp(String processId);
 }

--
Gitblit v1.8.0