From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +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 | 333 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 230 insertions(+), 103 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 621c55d..c890126 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,6 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.common.RabbitMQUtil;
import com.example.erp.entity.pp.*;
import com.example.erp.entity.sd.Delivery;
@@ -18,10 +20,17 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.text.DecimalFormat;
+import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@@ -38,7 +47,7 @@
RabbitMQUtil rabbitMQUtil;
//妯℃嫙璁＄畻
- public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
+ /*public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
Map<String, Object> map = new HashMap<>();
try {
rabbitMQUtil = new RabbitMQUtil();
@@ -46,10 +55,10 @@
// 鑾峰彇 computeData 鍜� cardData
- /*Object computeData = message.get("computeData");
- Object cardData = message.get("cardData");*/
+ *//*Object computeData = message.get("computeData");
+ Object cardData = message.get("cardData");*//*
- rabbitMQUtil.sendMessage(message.toString());
+ rabbitMQUtil.sendMessage(message.toString());
System.out.println("send message: " + message);
String date = rabbitMQUtil.receiveMessages();
System.out.println("Received message: " + date);
@@ -65,6 +74,50 @@
}
return map;
+ }*/
+
+ public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
+ Map<String, Object> map = new HashMap<>();
+ try {
+ URL url = new URL("https://example.com"); // 鏇挎崲涓轰綘鐨勭洰鏍� URL
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+ conn.setRequestMethod("POST");
+ conn.setDoOutput(true); // 鍏佽鍐欏叆璇锋眰浣�
+ conn.setConnectTimeout(5000);
+ // 璇诲彇瓒呮椂锛堢瓑寰呮湇鍔″櫒鍝嶅簲鐨勬渶澶ф椂闂达級
+ conn.setReadTimeout(108000);
+
+ // 鍐欏叆璇锋眰浣撴暟鎹�
+ String postData = message.toString();
+ try (OutputStream os = conn.getOutputStream()) {
+ byte[] input = postData.getBytes(StandardCharsets.UTF_8);
+ os.write(input, 0, input.length);
+ }
+
+ // 3. 鑾峰彇鐘舵�佺爜
+ int statusCode = conn.getResponseCode();
+ System.out.println("鐘舵�佺爜: " + statusCode);
+
+ // 4. 璇诲彇鍝嶅簲鍐呭
+ BufferedReader reader = new BufferedReader(
+ new InputStreamReader(conn.getInputStream())
+ );
+ String line;
+ StringBuilder response = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+ reader.close();
+
+ // 杈撳嚭鍝嶅簲鍐呭
+ System.out.println("鍝嶅簲鍐呭:\n" + response.toString());
+
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return map;
}
@@ -73,10 +126,108 @@
try {
Map<String, Object> objectMap = (Map<String, Object>) object.get("inputValues");
String projectNo = objectMap.get("project_no").toString();
+ String userName = object.get("userName").toString();
Map<String, Object> optimizeProjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
- glassOptimizeMapper.addSimulation(object);
- glassOptimizeMapper.addratioResult(object);
- glassOptimizeMapper.addratioProjectResult(object);
+
+ if(Integer.valueOf(object.get("state").toString())==3){
+ List<Map<String, Object>> flowCardList = glassOptimizeMapper.selectProjectComputeMp(projectNo);
+ int index=0;
+ for (Map<String, Object> flowCard:flowCardList){
+ List<Map<String, Object>> glassDetailList=new ArrayList<>();
+ if(Integer.valueOf(flowCard.get("patch_state").toString())==0){
+ glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()));
+
+ }else{
+ glassDetailList = glassOptimizeMapper.selectComputeDetailMpPatchState(flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()));
+ }
+ for (Map<String, Object> glassDetail:glassDetailList){
+ for(int i=0;i<Integer.valueOf(glassDetail.get("quantity").toString());i++){
+ index+=1;
+ glassOptimizeMapper.insertOptimizeHeatDetail(
+ projectNo,flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()),
+ Integer.valueOf(flowCard.get("patch_state").toString()),
+ Integer.valueOf(glassDetail.get("order_number").toString()),
+ Double.valueOf(glassDetail.get("width").toString()),
+ Double.valueOf(glassDetail.get("height").toString()),index,userName
+ );
+
+ }
+ }
+ glassOptimizeMapper.updateProjectTemperingStateMp(projectNo,1);
+ }
+ }else{
+ List<Map<String, Object>> objectList = (List<Map<String, Object>>) object.get("projectdetail");
+ for (Map<String, Object> objectMap1:objectList){
+ Integer count = glassOptimizeMapper.selectPatchLogState(objectMap1.get("process_id").toString(),
+ Integer.valueOf(objectMap1.get("layers_number").toString()),Integer.valueOf(objectMap1.get("order_number").toString()),projectNo);
+ if(count>0){
+ objectMap1.put("patchState",1);
+ }else {
+ objectMap1.put("patchState",0);
+ }
+ }
+ glassOptimizeMapper.addSimulation(object);
+ glassOptimizeMapper.addratioResult(object);
+ glassOptimizeMapper.addratioProjectResult(object);
+
+
+ if(Integer.valueOf(object.get("state").toString())==2){
+ List<Map<String, Object>> flowCardList = glassOptimizeMapper.selectProjectComputeMp(projectNo);
+ List<String> rackinfosList = (List<String>) object.get("rackinfos");
+ Iterator<Map<String, Object>> iterator = flowCardList.iterator();
+ while (iterator.hasNext()) {
+ Map<String, Object> map = iterator.next();
+ for(String rackinfos:rackinfosList){
+ String processId=rackinfos.substring(0,14);
+ String processId1=map.get("processId").toString();
+ Integer technologyNumber= Integer.valueOf(rackinfos.substring(15));
+ Integer technologyNumber1= Integer.valueOf(map.get("technologyNumber").toString());
+ if(map.get("processId").toString().equals(processId) && Integer.valueOf(map.get("technologyNumber").toString())==technologyNumber){
+ iterator.remove();
+ }
+ }
+ }
+
+ int index=0;
+ for (Map<String, Object> flowCard:flowCardList){
+ List<Map<String, Object>> glassDetailList=new ArrayList<>();
+ if(flowCard.get("patch_state").toString()=="0"){
+ glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()));
+
+ }else{
+ glassDetailList = glassOptimizeMapper.selectComputeDetailMp(flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()));
+ }
+ for (Map<String, Object> glassDetail:glassDetailList){
+ for(int i=0;i<Integer.valueOf(glassDetail.get("quantity").toString());i++){
+ index+=1;
+ glassOptimizeMapper.insertOptimizeHeatDetail(
+ projectNo,flowCard.get("processId").toString(),
+ Integer.valueOf(flowCard.get("technologyNumber").toString()),
+ Integer.valueOf(flowCard.get("patch_state").toString()),
+ Integer.valueOf(glassDetail.get("order_number").toString()),
+ Double.valueOf(glassDetail.get("width").toString()),
+ Double.valueOf(glassDetail.get("height").toString()),index,userName
+ );
+
+ }
+ }
+ }
+ }
+
+ }
+ if(Integer.valueOf(optimizeProjectMap.get("optimize_state").toString())==1){
+ List<OptimizeHeatDetail> optimizeHeatDetail = glassOptimizeMapper.selectOptimizeHeatDetail(projectNo);
+ for (OptimizeHeatDetail projectdetail:optimizeHeatDetail){
+ OptimizeDetail optimizeDetail=glassOptimizeMapper.selectOptimizeDetailById(projectNo,projectdetail.getProcessId(),
+ projectdetail.getOrderSort(),projectdetail.getLayer());
+ glassOptimizeMapper.updateOptimizeDetail(optimizeDetail.getId(),projectdetail.getLayoutId(),projectdetail.getSort());
+ }
+ }
return true;
} catch (Exception e) {
@@ -87,12 +238,12 @@
//浼樺寲璁剧疆淇濆瓨
- public Boolean optimizeParmsSave(Map<String, Object> object) {
+ public Boolean optimizeParmsSave(Map<String, Object> object,String username) {
try {
ObjectMapper mapper = new ObjectMapper();
String jsonString = mapper.writeValueAsString(object);
- glassOptimizeMapper.optimizeParmsSave(jsonString);
+ glassOptimizeMapper.optimizeParmsSave(jsonString,username);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -103,11 +254,32 @@
//浼樺寲璋冩暣缁撴灉淇濆瓨
- public Boolean saveOptimizeResult(Map<String, Object> object) {
+ public Boolean saveOptimizeResult(Map<String, Object> object,String projectId) {
try {
+ Map<String, Object> optimalResults = (Map<String, Object>) object.get("optimalResults");
+ List<Map<String, Object>> originalFilm = (List<Map<String, Object>>) object.get("originalFilm");
+ glassOptimizeMapper.addOptimizeUse(originalFilm,projectId,"admin");
+
ObjectMapper mapper = new ObjectMapper();
- String jsonString = mapper.writeValueAsString(object);
- glassOptimizeMapper.optimizeResultSave(jsonString);
+ String json = mapper.writeValueAsString(optimalResults);
+ glassOptimizeMapper.addOptimizeProjectFile(json,projectId,"admin");
+
+ List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) optimalResults.get("layouts");
+ glassOptimizeMapper.addOptimizeLayout(objectMapList,projectId);
+ for(Map<String, Object> objectMap:objectMapList){
+ List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
+ //杩唬鐜荤拑鏄庣粏闆嗗悎鍒犻櫎浣欐枡
+ Iterator<Map<String, Object>> iterator = objectMap2.iterator();
+ while (iterator.hasNext()) {
+ Map<String, Object> map = iterator.next();
+ if (map.get("isRemain").toString()=="true") {
+ iterator.remove();
+ }
+ }
+
+ glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
+ }
+ glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -132,22 +304,29 @@
public Map<String, Object> selectOptimizeResult(String processId) {
Map<String, Object> map = new HashMap<>();
map.put("data", glassOptimizeMapper.selectOptimizeResult(processId));
+ map.put("optimizeUse", glassOptimizeMapper.materialStoreOptimizeUse(processId));
return map;
}
//宸ョ▼淇℃伅
- public Map<String, Object> projectInfoSv(String projectNo) {
+ public Map<String, Object> projectInfoSv(String projectNo,String username) {
Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
Map<String, Object> map = new HashMap<>();
- if(Integer.parseInt(stringObjectMap.get("state").toString())<10){
+ if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1){
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+ map.put("data", glassOptimizeMapper.getOptimizeDetail(projectNo));
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", null);
+ } else if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1) {
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+ map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+ } else{
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
- }else if(stringObjectMap.get("state").equals(10)){
- map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
- }else{
- map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
}
return map;
}
@@ -161,10 +340,10 @@
}
//搴撳瓨淇℃伅
- public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber,Integer type) {
+ public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber,Integer type,String username) {
Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
Map<String, Object> map = new HashMap<>();
- if(Integer.parseInt(stringObjectMap.get("state").toString())<10){
+ if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==0){
if(type==1){
map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
}else if(type==2){
@@ -172,21 +351,13 @@
}else{
map.put("data", glassOptimizeMapper.materialStoreSurplusMp(thickness,model));
}
- map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
- }else if(Integer.parseInt(stringObjectMap.get("state").toString())==10){
- if(type==1){
- map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
- }else if(type==2){
- map.put("data", glassOptimizeMapper.surplusMaterialsMp(thickness,model));
- }else{
- map.put("data", glassOptimizeMapper.materialStoreSurplusMp(thickness,model));
- }
- map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
+ map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming(username));
}else{
map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
map.put("edgeTrimming", null);
}
map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
+
return map;
}
@@ -228,20 +399,21 @@
}
//淇敼鎺掔増鐘舵��
- public Boolean updateProjectState(String projectNumber, Integer state, Integer code) {
+ public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) {
if (!projectNumber.isEmpty()) {
//鎾ら攢妯℃嫙璁＄畻
if(code==1){
glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
- glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ glassOptimizeMapper.updateProjectTemperingStateMp(projectNumber, states);
}
//鎾ら攢浼樺寲鎺掔増
else if(code==2){
- glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
- glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
- glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
- glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.deleteOptimizeProjectFile(projectNumber);
+ glassOptimizeMapper.updateOptimizeUse(projectNumber);
+ glassOptimizeMapper.updateProjectOptimizeStateMp(projectNumber, states);
}
//鍏佽鐢熶骇
else if(code==3){
@@ -264,11 +436,15 @@
//鍒犻櫎宸ョ▼
public boolean deleteProject(String projectNumber,Integer type) {
Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
- if(stringObjectMap.get("state").equals(10)){
+ if(stringObjectMap.get("tempering_state").equals(1)){
glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
- }else if(stringObjectMap.get("state").equals(20)){
+ }
+ if(stringObjectMap.get("optimize_state").equals(1)){
glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.deleteOptimizeLayout(projectNumber);
+ glassOptimizeMapper.updateOptimizeUse(projectNumber);
glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
}
@@ -435,30 +611,30 @@
}
- public Map<String, Object> getConfiguration(String type) {
+ public Map<String, Object> getConfiguration(String type,String username) {
Map<String, Object> map = new HashMap<>();
if(type.equals("閽㈠寲")){
- map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ map.put("data", glassOptimizeMapper.getTemperedConfiguration(username));
}else if(type.equals("纾ㄩ噺")){
- map.put("data", glassOptimizeMapper.getGrindingTrimming());
+ map.put("data", glassOptimizeMapper.getGrindingTrimming(username));
}else if(type.equals("淇竟")){
- map.put("data", glassOptimizeMapper.getEdgeTrimming());
+ map.put("data", glassOptimizeMapper.getEdgeTrimming(username));
}
return map;
}
- public Boolean saveConfiguration(Map<String,Object> object,String type) {
+ public Boolean saveConfiguration(Map<String,Object> object,String type,String username) {
String json = "";
if (object.get("json") != null) {
json = object.get("json").toString();
}
if(type.equals("閽㈠寲")){
- glassOptimizeMapper.updateOptimizeConfig(json,1);
+ glassOptimizeMapper.updateOptimizeConfig(json,1,username);
} else if (type.equals("淇竟")) {
- glassOptimizeMapper.updateOptimizeConfig(json,5);
+ glassOptimizeMapper.updateOptimizeConfig(json,5,username);
}else if (type.equals("纾ㄩ噺")) {
- glassOptimizeMapper.updateOptimizeConfig(json,4);
+ glassOptimizeMapper.updateOptimizeConfig(json,4,username);
}
return true;
@@ -466,59 +642,6 @@
- public String simulatedTypesetting(Map<String, Object> object) {
-
- String optionVal = "";
- Integer quantity = 0;
- Double area = 0.0;
- if (object.get("optionVal") != null) {
- optionVal = object.get("optionVal").toString();
- }
- if (object.get("quantity") != null) {
- quantity = Integer.valueOf(object.get("quantity").toString());
- }
- if (object.get("area") != null) {
- area = Double.valueOf(object.get("area").toString());
- }
- List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);
-
-
- int currentQuantity = 0;
- double currentArea = 0;
- List<List<Map<String, Object>>> result = new ArrayList<>();
- List<Map<String, Object>> currentGroup = new ArrayList<>();
-
- if(area==0 && quantity>0){
- for(Map<String, Object> flowCardNormal: flowCardListNormal){
- if (Integer.valueOf(flowCardNormal.get("quantity").toString()) > quantity ) {
- continue;
- }
- int newQuantity = currentQuantity + Integer.valueOf(flowCardNormal.get("quantity").toString());
- double newArea = currentArea + Double.valueOf(flowCardNormal.get("area").toString());
- if(newQuantity>quantity){
- result.add(currentGroup);
- currentGroup = new ArrayList<>();
- currentQuantity = 0;
- currentArea = 0;
- newQuantity = Integer.valueOf(flowCardNormal.get("quantity").toString());
- newArea = Double.valueOf(flowCardNormal.get("area").toString());
-
- }
- currentGroup.add(flowCardNormal);
- currentQuantity = newQuantity;
- currentArea = newArea;
-
- }
-
- if (!currentGroup.isEmpty()) {
- result.add(currentGroup);
- }
- }
- System.out.println(result);
-
- return "";
-
- }
public String simulatedTypesetting1(Map<String, Object> object) {
@@ -538,7 +661,11 @@
} else {
area = 0.0;
}
- List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);
+
+ JSONArray materialStore = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialStore")));
+
+
+ List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListSimulated(optionVal);
Queue<Map<String, Object>> queue = flowCardListNormal.stream()
--
Gitblit v1.8.0