From d64a5b5aa83fe566f43216ac718b970fbb9c96f7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 十二月 2024 16:46:13 +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/GlassOptimizeMapper.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
index 6438c2f..61f9ed7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java
@@ -15,6 +15,9 @@
     //宸ョ▼淇℃伅
     List<Map<String, Object>> projectInfoMp(String projectNo);
 
+    //宸ョ▼淇℃伅娴佺▼鍗�
+    List<Map<String, Object>> getProcessCardMp(String projectNo);
+
     //搴撳瓨淇℃伅
     List<Map<String, Object>>  materialStoreMp(String thickness, String model);
 
@@ -39,4 +42,16 @@
 
     //妯℃嫙璁$畻娴佺▼鍗¤鎯�
     List<Map<String, Object>> selectComputeDetailMp(String processId);
+
+    List<Map<String, Object>> getProcessCardDetailmMp(String processId, Integer technologyNumber);
+
+    List<Map<String, Object>> selectGlassTypeMp();
+
+    List<Map<String, Object>> getProjectIdSv();
+
+    Boolean updateFlowCardProject(String processId, String technologyNumber, String projectId);
+
+    Double getSelectArea(String processId, String technologyNumber);
+
+    Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType, Integer sumQuantity, Double sumArea, String userName);
 }

--
Gitblit v1.8.0