From 1e6c537c6ae83a30fa3732939d16422ff2d105dd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 十二月 2025 09:22:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 218252f..d4fea5f 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
@@ -124,6 +124,9 @@
List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+ List<Map<String, Object>> getReworkPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+
List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);
@@ -162,11 +165,16 @@
List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
+ List<Map<String, Object>> getgetPrintCustomDataSemiSp(String processId, String technologyNumber, Integer orderNumber);
+
List<Map<String, String>> selectPrintNotMp(String orderId);
List<Map<String, String>> selectPrintNotMergeMp(String orderId);
- List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+ List<Map<String, Object>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+ List<Map<String, String>> getReworkPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
List<Map<String, String>> selectPrintAllMp(String orderId);
@@ -205,7 +213,9 @@
List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
- List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+ List<Map<String, Object>> getPrintProjectDetailsMpSp(String projectNo,List<Integer> stockId);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId,Integer polysId);
List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
@@ -279,4 +289,20 @@
Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
+
+ List<Map<String, String>> getPrimaryListRefundHB(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
+
+ Map<String, Object> getTerminationQuantity(String processId, Integer orderNumber);
+
+ Boolean updateTerminationStatus(String processId, Integer orderNumber);
+
+ Boolean updateTerminationNoMp(String processId, Integer orderNumber);
+
+ List<Map<String, Object>> getNewProcessMp(String processId, String orderNumber, String technologyNumber);
+
+ Map<String, Object> getProcessInfo( String processName);
+
+ List<Map<String, String>> OrderProcess();
+
+ List<Map<String, String>> PrintProgressProcessCardData(String startDate, String endDate);
}
--
Gitblit v1.8.0