From d64a5b5aa83fe566f43216ac718b970fbb9c96f7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 十二月 2024 16:46:13 +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/service/pp/GlassOptimizeService.java | 125 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 122 insertions(+), 3 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..fd963a8 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
@@ -4,10 +4,9 @@
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.FlowCard;
+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;
@@ -23,11 +22,131 @@
GlassOptimizeMapper glassOptimizeMapper;
+ //宸ョ▼淇℃伅
+ public Map<String, Object> projectInfoSv(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
+ return map;
+ }
+ //宸ョ▼淇℃伅娴佺▼鍗�
+ public Map<String, Object> getProcessCardSv(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProcessCardMp(projectNo));
+ return map;
+ }
+
+ //搴撳瓨淇℃伅
+ public Map<String, Object> materialStoreSv(String thickness, String model) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ return map;
+ }
+
+
+ //宸ョ▼鏌ヨ娴佺▼鍗�
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> deleteProject(String projectNumber) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.deleteProjectMp(projectNumber));
+ return map;
+ }
+
+
+ public Map<String, Object> getProjectListSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProjectListMp());
+ return map;
+ }
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ public Map<String, Object>selectProjectComputeSv(String projectNumber) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.selectProjectComputeMp(projectNumber));
+ return map;
+ }
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ public Map<String, Object>selectComputeDetailSv(String processId) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.selectComputeDetailMp(processId));
+ return map;
+ }
+
+ public Map<String, Object> getProcessCardDetailSv(String processId, Integer technologyNumber) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProcessCardDetailmMp(processId,technologyNumber));
+ return map;
+ }
+
+ public Map<String, Object> selectGlassTypeSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.selectGlassTypeMp());
+ return map;
+ }
+
+
+ public Map<String, Object> getProjectIdSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProjectIdSv());
+ return map;
+ }
+
+ public Boolean addProjectSv(String optionVal, String projectId, String projectNmae, Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ if ("null".equals(projectNmae)) {
+ projectNmae = "";
+ }
+ Double sumArea = (double) 0;
+ Double area = (double) 0;
+ Integer sumQuantity = 0;
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
+ glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber());
+ sumArea += area;
+ sumQuantity +=flowCard.getQuantity();
+ }
+ int index = optionVal.indexOf("mm");
+ // 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
+ String glass_thickness = optionVal.substring(0, index);
+ // 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
+ String glass_type = optionVal.substring(index + 2);
+ glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea,userName);
+ return true;
+ }
+ else {
+ return false;
+
+ }
+ }
}
--
Gitblit v1.8.0