From 12878263caa8d18860111d6f6900d495e9d9369c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 十二月 2024 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 2559086..91b894c 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.OptimizeProjectMange;
import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.sql.Date;
import java.util.List;
@@ -11,6 +12,12 @@
@Mapper
public interface GlassOptimizeMapper {
+ //宸ョ▼淇℃伅
+ List<Map<String, Object>> projectInfoMp(String projectNo);
+
+ //搴撳瓨淇℃伅
+ List<Map<String, Object>> materialStoreMp(String thickness, String model);
+
//宸ュ崟绠＄悊鏌ヨ鏈浆宸ュ崟鏁版嵁
List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
@@ -26,4 +33,22 @@
//鍒犻櫎宸ョ▼
int deleteProjectMp(String projectNumber);
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ List<Map<String, Object>> selectProjectComputeMp(@Param("projectNo")String projectNumber);
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ List<Map<String, Object>> selectComputeDetailMp(String processId);
+
+ List<Map<String, Object>> getProcessCardDetailmMp(String processId, Integer technologyNumber);
+
+ List<Map<String, Object>> selectGlassTypeMp();
+
+ List<Map<String, Object>> getProjectIdSv();
+
+ Boolean updateFlowCardProject(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);
}
--
Gitblit v1.8.0