From f60327c377097f67ed42c349bda2a54c3147b7be Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 07 三月 2024 16:35:45 +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/ReportingWorkMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index a893ed4..89418ed 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -26,7 +26,7 @@
List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);
- List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String previousProcess);
+ List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
List<Map<String,String>> SelectProcessMp();
@@ -41,4 +41,8 @@
List<Map<String,BasicDataProduce>> selectBasicNameByType(String type);
Integer selectMaxReportingWorkId();
+
+ int selectGlassProcessNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
+
+ int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
}
--
Gitblit v1.8.0