From 15fa56463061f1e94140e23e98987aa3131714bf Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 七月 2024 17:24:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 4 ++--
1 files changed, 2 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 2e4cb03..7a995a8 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
@@ -72,7 +72,7 @@
List<Map<String, String>> selectPrintMp(String orderId);
- List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
+ List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
@@ -102,7 +102,7 @@
List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
- List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber, String reportingWorkId);
List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
--
Gitblit v1.8.0