From 62dc28f15134c54db886ae0226ed754b8c135ce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 四月 2025 16:24:43 +0800
Subject: [PATCH] 修边磨量同步数据库

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 a2f73b3..ec119fb 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
@@ -3,6 +3,7 @@
 
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.pp.OptimizeProjectMange;
+import com.example.erp.entity.pp.OptimizeUse;
 import com.example.erp.entity.sd.OrderGlassDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,8 +25,10 @@
     //搴撳瓨淇℃伅
     List<Map<String, Object>>  materialStoreMp(String thickness, String model);
 
+    List<Map<String, Object>>  materialStoreOptimizeUse(String projectNumber);
+
     //宸ュ崟绠$悊鏌ヨ鏈浆宸ュ崟鏁版嵁
-    List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+    List<Map<String, Object>> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
 
     //鍒涘缓宸ョ▼鑶滅郴鏌ヨ
     List<Map<String, Object>> getFlowCardListMp(String optionVal, Integer radio);
@@ -90,4 +93,10 @@
                          Integer sumQuantity, Double sumArea, String userName,Integer processIdCount, String processId, Integer type);
 
     List<Map<String, Object>> getTemperedConfiguration();
+
+    List<Map<String, Object>> getGrindingTrimming();
+
+    List<Map<String, Object>> getEdgeTrimming();
+
+    Boolean updateOptimizeConfig(String json,Integer type);
 }

--
Gitblit v1.8.0