From 68d7be0814e89ef811c2e7c435dff7af64ea60c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 十二月 2024 10:11:21 +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 | 20 +++++++++++++++++++-
1 files changed, 19 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 4cf2c41..e5d003b 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,6 +1,7 @@
package com.example.erp.mapper.pp;
-import com.example.erp.entity.sd.OrderDetail;
+
+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;
@@ -14,5 +15,22 @@
//宸ュ崟绠＄悊鏌ヨ鏈浆宸ュ崟鏁版嵁
List<OrderGlassDetail> selectWordOrder(Date selectTime1, Date selectTime2, OrderGlassDetail orderGlassDetail);
+ //鍒涘缓宸ョ▼鑶滅郴鏌ヨ
List<Map<String, Object>> getFlowCardListMp(String optionVal, Integer radio);
+
+ //宸ョ▼绠＄悊宸ョ▼鍙锋煡璇�
+ List<OptimizeProjectMange> optimizeProjectMangeMp(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange);
+
+ //淇敼宸ョ▼鐘舵��
+ Boolean updateProjectStateMp(String projectNumber,Integer state);
+ List<Map<String, Object>> getProjectListMp();
+
+ //鍒犻櫎宸ョ▼
+ int deleteProjectMp(String projectNumber);
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ List<Map<String, Object>> selectProjectComputeMp(@Param("projectNo")String projectNumber);
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ List<Map<String, Object>> selectComputeDetailMp(String processId);
}
--
Gitblit v1.8.0