From aece48b253b2e0b814bbdf5ee3d474e8cf697122 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:48 +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/GlassOptimizeMapper.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 6502aa7..63e20e9 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
@@ -212,7 +212,35 @@
void deleteOffcutDetails(String processId);
- void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness);
+ void addUpdateOffcut(Map<String, Object> detail, String processId, String glassType, String glassThickness, int stockId);
- void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults);
+ void updateProjectOptimize(String projectId, Integer states, Map<String, Object> optimalResults,double totalArea );
+
+ List<Map<String, Object>> getReportDataProcessIdSv(String processId);
+
+ List<Map<String, Object>> getPeriMeterDataSv(String processId);
+
+ List<Map<String, Object>> getMaterialInfoSv(String processId);
+
+ List<Map<String, Object>> getProductListSv(String processId);
+
+ List<Map<String, Object>> selectProjectList(String processId);
+
+ List<Map<String, Object>> materialOptimizeUse(String processId);
+
+ List<Map<String, Object>> getLayoutSetSv(String processId);
+
+ String selectConfigByUserAndType(String username, int type);
+
+ void insertOptimizeConfig(String json, int type, String userName, String configName);
+
+ Map<String, Object> getGlassProjectList(String projectId);
+
+ Map<String, Object> getProjectState(String projectNo);
+
+ void updateProjectTemperingId(String projectNumber);
+
+ List<Map<String, Object>> optimizeTemp(String projectNo);
+
+ List<Map<String, Object>> selectTempProject(String processId);
}
--
Gitblit v1.8.0