From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +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 | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 158 insertions(+), 0 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 5c46174..3d5c1f1 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,21 +1,98 @@
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.common.RabbitMQUtil;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.OptimizeProjectMange;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
import java.sql.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeoutException;
@Service
@DS("sd")
public class GlassOptimizeService {
@Autowired
GlassOptimizeMapper glassOptimizeMapper;
+
+ RabbitMQUtil rabbitMQUtil;
+ //妯℃嫙璁＄畻
+
+ public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
+ Map<String, Object> map = new HashMap<>();
+ try {
+ rabbitMQUtil = new RabbitMQUtil();
+ // 鍙戦�佹秷鎭�
+
+
+ // 鑾峰彇 computeData 鍜� cardData
+ Object computeData = message.get("computeData");
+ Object cardData = message.get("cardData");
+
+ rabbitMQUtil.sendMessage("6");
+ System.out.println("send message: " + message);
+ String date = rabbitMQUtil.receiveMessages();
+ System.out.println("Received message: " + date);
+
+ // 鍏抽棴杩炴帴
+ rabbitMQUtil.close();
+ map.put("data", date);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (TimeoutException | InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ return map;
+ }
+
+
+//妯℃嫙璁＄畻淇濆瓨
+ public Boolean addSimulation(Map<String, Object> object) {
+ try {
+ glassOptimizeMapper.addSimulation(object);
+ glassOptimizeMapper.addratioResult(object);
+ glassOptimizeMapper.addratioProjectResult(object);
+
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ //宸ョ▼淇℃伅
+ 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;
+ }
//宸ョ▼鏌ヨ娴佺▼鍗�
@@ -42,4 +119,85 @@
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