From 30e2ad8ca10dd49901c52da26f166d32ee4e8454 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 10 四月 2025 09:23:17 +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 | 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 ec119fb..623f6ee 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
@@ -4,6 +4,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.pp.PatchLog;
import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -17,10 +18,16 @@
//宸ョ▼淇℃伅
List<Map<String, Object>> projectInfoMp(String projectNo);
+ List<Map<String, Object>> firstOptimization(String projectNo);
+
+ List<Map<String, Object>> analogComputationOptimization(String projectNo);
+
//宸ョ▼淇℃伅娴佺▼鍗�
List<Map<String, Object>> getProcessCardMp(String projectNo);
List<FlowCard> getFlowCardList(String projectNo);
+
+ List<PatchLog> getPatchLogList(String projectNo);
//搴撳瓨淇℃伅
List<Map<String, Object>> materialStoreMp(String thickness, String model);
@@ -35,6 +42,8 @@
List<Map<String, Object>> getFlowCardListWhole(String optionVal);
List<Map<String, Object>> getFlowCardListNormal(String optionVal);
List<Map<String, Object>> getFlowCardListPatch(String optionVal);
+
+ List<Map<String, Object>> getFlowCardListModify(String type,String thickness,String projectNO);
//宸ョ▼绠＄悊宸ョ▼鍙锋煡璇�
List<OptimizeProjectMange> optimizeProjectMangeMp(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange);
@@ -85,10 +94,16 @@
Boolean updateFlowCardProject(String processId, String technologyNumber, String projectId);
+ Boolean updatePatchLogProject(String processId, String technologyNumber, String projectId);
+
Boolean updateFlowCardProjectReturn(String processId, String technologyNumber, String projectId);
+ Boolean updatePatchLogProjectReturn(String processId, Integer technologyNumber, String projectId);
+
Double getSelectArea(String processId, String technologyNumber);
+ Double getSelectAreaPatchLog(String processId, String technologyNumber);
+
Boolean addProjectMp(String projectId, String projectNmae, String glassThickness, String glassType,
Integer sumQuantity, Double sumArea, String userName,Integer processIdCount, String processId, Integer type);
--
Gitblit v1.8.0