From a6f59f0908e5787d55c098c17f4eec365cf6477a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 23 十一月 2024 11:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index b53e355..c9e1493 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -1,19 +1,14 @@
package com.example.erp.service.pp;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.pp.OptimizeProjectMange;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
-import com.example.erp.mapper.pp.WorkOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@Service
@@ -23,11 +18,33 @@
GlassOptimizeMapper glassOptimizeMapper;
-
+ //宸ョ▼鏌ヨ娴佺▼鍗�
public Map<String, Object> getFlowCardList(String optionVal, Integer radio) {
Map<String, Object> map = new HashMap<>();
map.put("data", glassOptimizeMapper.getFlowCardListMp(optionVal, radio));
return map;
}
-}
+
+ //宸ョ▼绠＄悊鏌ヨ
+ public Map<String, Object> OptimizeProjectMange(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.optimizeProjectMangeMp(startSelectTime, endSelectTime , optimizeProjectMange));
+ return map;
+ }
+//淇敼鎺掔増鐘舵��
+ public Boolean updateProjectState(String projectNumber, Integer state) {
+ if (!projectNumber.isEmpty()) {
+ glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
+ public Map<String, Object> getProjectListSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProjectListMp());
+ return map;
+ }}
--
Gitblit v1.8.0