From 1e1c416c6aa6596feb333b75d882ffeede73d3c9 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:34 +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/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 31bd51d..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
@@ -1,7 +1,9 @@
package com.example.erp.mapper.pp;
+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;
@@ -18,14 +20,21 @@
//宸ョ▼淇℃伅娴佺▼鍗�
List<Map<String, Object>> getProcessCardMp(String projectNo);
+ List<FlowCard> getFlowCardList(String projectNo);
+
//搴撳瓨淇℃伅
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);
+ List<Map<String, Object>> getFlowCardListWhole(String optionVal);
+ List<Map<String, Object>> getFlowCardListNormal(String optionVal);
+ List<Map<String, Object>> getFlowCardListPatch(String optionVal);
//宸ョ▼绠＄悊宸ョ▼鍙锋煡璇�
List<OptimizeProjectMange> optimizeProjectMangeMp(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange);
@@ -37,8 +46,16 @@
//鍒犻櫎宸ョ▼
int deleteProjectMp(String projectNumber);
+ int deleteOptimizeHeatDetail(String projectNumber);
+
+ int deleteOptimizeHeatLayout(String projectNumber);
+
+ int deleteOptimizeDetail(String projectNumber);
+
//妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
List<Map<String, Object>> selectProjectComputeMp(@Param("projectNo")String projectNumber);
+
+ Map<String, Object> selectProjectCount(@Param("projectNo")String projectNumber);
//妯℃嫙璁＄畻娴佺▼鍗¤鎯�
List<Map<String, Object>> selectComputeDetailMp(String processId);
@@ -68,7 +85,18 @@
Boolean updateFlowCardProject(String processId, String technologyNumber, String projectId);
+ Boolean updateFlowCardProjectReturn(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);
+ Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType,
+ 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