From 24888c4b2ca2ffc49c4d94aefd6aea32d515b6dd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 20 四月 2025 14:17:24 +0800
Subject: [PATCH] 分架明细报表修改查询问题
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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 a2f73b3..1b1e97d 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,8 @@
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;
@@ -16,22 +18,36 @@
//宸ョ▼淇℃伅
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);
+ List<Map<String, Object>> surplusMaterialsMp(String thickness, String model);
+
+ List<Map<String, Object>> materialStoreSurplusMp(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<Map<String, Object>> getFlowCardListModify(String type,String thickness,String projectNO);
//宸ョ▼绠＄悊宸ョ▼鍙锋煡璇�
List<OptimizeProjectMange> optimizeProjectMangeMp(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange);
@@ -55,7 +71,9 @@
Map<String, Object> selectProjectCount(@Param("projectNo")String projectNumber);
//妯℃嫙璁＄畻娴佺▼鍗¤鎯�
- List<Map<String, Object>> selectComputeDetailMp(String processId);
+ List<Map<String, Object>> selectComputeDetailMp(String processId,Integer technologyNumber);
+
+ List<Map<String, Object>> selectComputeDetailMpPatchState(String processId,Integer technologyNumber);
//妯℃嫙璁＄畻淇濆瓨 閽㈠寲鎺掔増璇︽儏
@@ -82,12 +100,27 @@
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);
+ Boolean updateProjectMp(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