From 946f0711b0b15a3da1b84edbb5d8aadd6f63dff1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 17 二月 2025 08:30:46 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 1cff561..4dd26ef 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
@@ -40,6 +40,8 @@
//鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
Integer reportingWorkCount(String processId);
+ Integer reportingWorkCountByOrderId(String orderId);
+
//鎻掑叆Flow_card琛�
Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);
@@ -66,6 +68,7 @@
List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
Boolean deleteReportingWork(String processId);
+ Boolean deleteReportingWorkByOrderId(String orderId);
List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
@@ -105,7 +108,9 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Map<String, Object>> getPrintCustomData(String processId, String technologyNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);
+
+ List<Map<String, Object>> getPrintCustomData2(String processId);
Integer getPrintLabelCount(String processId, String technologyNumber);
@@ -188,6 +193,7 @@
Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
Boolean deleteflowCardSort(String orderId, String processId);
+ Boolean deleteflowCardSortByOrderId(String orderId);
List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
@@ -212,4 +218,6 @@
Integer updateProjectProcessPrintCount(String projectNo);
Integer selectProjectProcessPrintCount(String projectNo);
+
+ int flowCardToOptimizeCount(String orderId);
}
--
Gitblit v1.8.0