From 026cd26aa0c96da331a56ab1782a003e0cb9b48b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 08 一月 2025 09:30:41 +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 | 16 ++++++++++++++++
1 files changed, 16 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 56915b5..bf15037 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
@@ -75,7 +75,11 @@
List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process, String orderId);
+ List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
+
List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
+
+ List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
List<Map<String, Object>> getProcessList(String processId, String technologyNumber);
@@ -124,6 +128,8 @@
List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
+
+ List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
@@ -196,4 +202,14 @@
Boolean deleteProcessMp(String processId, String technologyNumber);
Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);
+
+ List<FlowCard> getFlowCardListPrintProject(String printProject);
+
+ Integer updateProjectLabelPrintCount(String projectNo);
+
+ Integer selectProjectLabelPrintCount(String projectNo);
+
+ Integer updateProjectProcessPrintCount(String projectNo);
+
+ Integer selectProjectProcessPrintCount(String projectNo);
}
--
Gitblit v1.8.0