From c18fecddd8c9a165c6a1026c5573f864e1713718 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 06 八月 2025 16:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 711 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 627 insertions(+), 84 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 8c480d4..f6e1d5e 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,35 +4,50 @@
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.FlowCard;
-import com.example.erp.entity.pp.OptimizeProjectMange;
+import com.example.erp.entity.pp.*;
+import com.example.erp.entity.sd.Delivery;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
+import com.example.erp.service.userInfo.SysErrorService;
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 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;
@Service
+@Transactional(rollbackFor = Exception.class)
@DS("sd")
public class GlassOptimizeService {
@Autowired
GlassOptimizeMapper glassOptimizeMapper;
+ @Autowired
+ SysErrorService sysErrorService;
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();
@@ -40,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("6");
+ rabbitMQUtil.sendMessage(message.toString());
System.out.println("send message: " + message);
String date = rabbitMQUtil.receiveMessages();
System.out.println("Received message: " + date);
@@ -59,15 +74,160 @@
}
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;
}
//妯℃嫙璁＄畻淇濆瓨
public Boolean addSimulation(Map<String, Object> object) {
try {
- glassOptimizeMapper.addSimulation(object);
- glassOptimizeMapper.addratioResult(object);
- glassOptimizeMapper.addratioProjectResult(object);
+ 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);
+
+ 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) {
@@ -78,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();
@@ -94,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();
@@ -123,23 +304,68 @@
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){
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getEdgeTrimming());
- }else if(stringObjectMap.get("state").equals(10)){
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getEdgeTrimming());
- }else{
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
- map.put("grindingTrimming", null);
+// 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("project", glassOptimizeMapper.selectProjectCount(projectNo));
+// map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+// }
+ map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
+ map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+ map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
+ return map;
+ }
+
+
+
+
+ public Object optimizeInfoSv(String projectNo, String username) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> dataList = null;
+ if (Integer.parseInt(stringObjectMap.get("tempering_state").toString())==1){
+ dataList = glassOptimizeMapper.computeAndOptimization(projectNo);
+ } else {
+ dataList = glassOptimizeMapper.directOptimization(projectNo);
}
+
+ // 鑾峰彇纾ㄩ噺閰嶇疆鏁版嵁
+ List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username);
+ // 灏嗙（閲忛厤缃暟鎹嫾鎺ュ埌姣忔潯涓绘暟鎹悗闈�
+ if (dataList != null && !dataList.isEmpty() && grindingTrimmingList != null && !grindingTrimmingList.isEmpty()) {
+ // 鑾峰彇绗竴鏉＄（閲忛厤缃暟鎹紙閫氬父鍙湁涓�鏉¤褰曪級
+ Map<String, Object> grindingConfig = grindingTrimmingList.get(0);
+ // 灏嗙（閲忛厤缃坊鍔犲埌姣忔潯涓绘暟鎹腑
+ for (Map<String, Object> dataItem : dataList) {
+ // 灏嗙（閲忛厤缃殑瀛楁娣诲姞鍒版瘡鏉℃暟鎹腑
+ for (Map.Entry<String, Object> entry : grindingConfig.entrySet()) {
+ // 閬垮厤瑕嗙洊鍘熸湁瀛楁
+ if (!dataItem.containsKey(entry.getKey())) {
+ dataItem.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ }
+ map.put("data", dataList);
return map;
}
@@ -152,16 +378,23 @@
}
//搴撳瓨淇℃伅
- public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber) {
+ 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){
- map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
- map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
+ if(Integer.parseInt(stringObjectMap.get("optimize_state").toString())==0){
+ 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(username));
}else{
map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
map.put("edgeTrimming", null);
}
+ map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
return map;
}
@@ -182,6 +415,20 @@
return map;
}
+ public Map<String, Object> getUpdateFlowCardList(String type,String thickness, Integer radio,String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ if(radio==1){
+ map.put("data", glassOptimizeMapper.getFlowCardListModify(type,thickness,projectNo));
+ }else if(radio==2){
+ map.put("data", glassOptimizeMapper.getFlowCardListNormal(type));
+ }else{
+ map.put("data", glassOptimizeMapper.getFlowCardListPatch(type));
+ }
+
+
+ return map;
+ }
+
//宸ョ▼绠＄悊鏌ヨ
public Map<String, Object> OptimizeProjectMange(Date startSelectTime, Date endSelectTime, OptimizeProjectMange optimizeProjectMange) {
Map<String, Object> map = new HashMap<>();
@@ -190,20 +437,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){
@@ -224,21 +472,36 @@
}
//鍒犻櫎宸ョ▼
- public boolean deleteProject(String projectNumber) {
+ 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);
}
List<FlowCard> flowCardList =glassOptimizeMapper.getFlowCardList(projectNumber);
- for (FlowCard flowCard:flowCardList){
- glassOptimizeMapper.updateFlowCardProjectReturn(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectNumber);
+ List<PatchLog> patchLogList =glassOptimizeMapper.getPatchLogList(projectNumber);
+ if(flowCardList!=null){
+ for (FlowCard flowCard:flowCardList){
+ glassOptimizeMapper.updateFlowCardProjectReturn(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectNumber);
+ }
}
- glassOptimizeMapper.deleteProjectMp(projectNumber);
+ if(patchLogList!=null){
+ for (PatchLog patchLog:patchLogList){
+ glassOptimizeMapper.updatePatchLogProjectReturn(patchLog.getProcessId(),patchLog.getTechnologyNumber(),projectNumber);
+ }
+ }
+ //鍒ゆ柇鏄惁鏄慨鏀瑰伐绋�
+ if(type.equals(1)){
+ glassOptimizeMapper.deleteProjectMp(projectNumber);
+ }
return true;
}
@@ -257,10 +520,26 @@
return map;
}
- //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
- public Map<String, Object>selectComputeDetailSv(String processId) {
+ public Map<String, Object>selectProjectComputeAll(String projectNumber) {
Map<String, Object> map = new HashMap<>();
- map.put("data", glassOptimizeMapper.selectComputeDetailMp(processId));
+ List<Map<String, Object>> projectComputeMpList=glassOptimizeMapper.selectProjectComputeMp(projectNumber);
+ for (Map<String, Object> stringObjectMap : projectComputeMpList) {
+ stringObjectMap.get("process_id");
+ stringObjectMap.get("technology_number");
+ }
+ map.put("data", glassOptimizeMapper.selectProjectComputeMp(projectNumber));
+ //map.put("project", glassOptimizeMapper.selectProjectCount(projectNumber));
+ return map;
+ }
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ public Map<String, Object>selectComputeDetailSv(String processId,Integer technologyNumber,String patchState) {
+ Map<String, Object> map = new HashMap<>();
+ if(patchState.equals("0")){
+ map.put("data", glassOptimizeMapper.selectComputeDetailMp(processId,technologyNumber));
+ }else{
+ map.put("data", glassOptimizeMapper.selectComputeDetailMpPatchState(processId,technologyNumber));
+ }
return map;
}
@@ -283,70 +562,334 @@
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 = "";
- }
- BigDecimal sumArea = new BigDecimal(0);
- double area = 0;
- Integer sumQuantity = 0;
- Integer type = 1;
- StringBuilder processId= new StringBuilder();
- 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()).doubleValue();
- sumArea = sumArea.add(BigDecimal.valueOf(area));
- sumQuantity +=flowCard.getQuantity();
- processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
+ public String addProjectSv(String optionVal, String projectId, String projectNmae, Map<String, Object> object) {
+ String saveState = "true";
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
}
- 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.doubleValue(),userName,
- flowCardList.size(), String.valueOf(processId),type);
- return true;
- }
- else {
- return false;
+ String projectType = "";
+ if (object.get("projectType") != null) {
+ projectType = object.get("projectType").toString();
+ }
+ if ("null".equals(projectNmae)) {
+ projectNmae = "";
+ }
+ BigDecimal sumArea = new BigDecimal(0);
+ double area = 0;
+ Integer sumQuantity = 0;
+ Integer type = 0;
+ int state1 = 0;
+ int state2 = 0;
+ StringBuilder processId= new StringBuilder();
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ if(projectType.equals("2")){
+ deleteProject(projectId,2);
+ }
+
+ // 鍒涘缓涓�涓槧灏勬潵瀛樺偍 (processId-technologyNumber) 缁勫悎鍒� rack 缂栧彿鐨勬槧灏�
+ Map<String, Integer> rackMap = new HashMap<>();
+ int rackCounter = 1;
+
+ for (FlowCard flowCard : flowCardList) {
+ // 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
+ String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
+ if (!rackMap.containsKey(key)) {
+ rackMap.put(key, rackCounter++);
+ }
+ int rackValue = rackMap.get(key);
+
+ if(flowCard.getPatchState().equals(0)){
+ state1=1;
+ //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
+ Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ // 鏇存柊娴佺▼鍗＄殑rack瀛楁
+ glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
+ area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+ sumArea = sumArea.add(BigDecimal.valueOf(area));
+ sumQuantity +=flowCard.getQuantity();
+ processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
+ }else{
+ state2=1;
+ Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
+ area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
+ sumArea = sumArea.add(BigDecimal.valueOf(area));
+ sumQuantity +=flowCard.getQuantity();
+ processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
+ }
+
+ }
+ if(state1==1&&state2==0){
+ type=1;
+ }else if(state1==1&&state2==1){
+ type=2;
+ }
+ int index = optionVal.indexOf("mm");
+ // 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
+ String glass_thickness = optionVal.substring(0, index);
+ // 鑾峰彇 "mm" 鍚庨潰鐨勯儴鍒�
+ String glass_type = optionVal.substring(index + 2);
+ if(projectType.equals("2")){
+ glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+ flowCardList.size(), String.valueOf(processId),type);
+ }else{
+ if(glassOptimizeMapper.selectProjectCount(projectId)==null){
+ glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
+ flowCardList.size(), String.valueOf(processId),type);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return "false1";
+ }
+ }
+ }else {
+ return "false2";
+
+ }
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("addProjectSv");
+ sysErrorService.insert(sysError);
+ saveState = "false";
}
+ return saveState;
+
}
- 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;
}
+
+
+
+
+ public String simulatedTypesetting1(Map<String, Object> object) {
+
+ String optionVal = "";
+ int quantity;
+ Double area;
+ if (object.get("optionVal") != null) {
+ optionVal = object.get("optionVal").toString();
+ }
+ if (object.get("quantity") != null) {
+ quantity = Integer.valueOf(object.get("quantity").toString());
+ } else {
+ quantity = 0;
+ }
+ if (object.get("area") != null) {
+ area = Double.valueOf(object.get("area").toString());
+ } else {
+ area = 0.0;
+ }
+
+ JSONArray materialStore = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialStore")));
+
+
+ List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListSimulated(optionVal);
+
+
+ Queue<Map<String, Object>> queue = flowCardListNormal.stream()
+ .filter(item -> {
+ if ((quantity>0 ? (Integer.valueOf(item.get("quantity").toString()) > quantity):false) || (area>0 ? (Double.valueOf(item.get("area").toString()) > area):false)) {
+ return false;
+ }
+ return true;
+ })
+ .collect(Collectors.toCollection(LinkedList::new));
+
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ while (!queue.isEmpty()) {
+ List<Map<String, Object>> currentGroup = new ArrayList<>();
+ Map<String, Object> currentGroupMap = new HashMap<>();
+ int currentCount = 0;
+ double currentArea = 0;
+
+ // 澶勭悊褰撳墠杞闃熷垪涓殑鎵�鏈夊厓绱�
+ int queueSize = queue.size();
+ boolean addedAny = false;
+
+ String processId="";
+ for (int i = 0; i < queueSize; i++) {
+ Map<String, Object> item = queue.poll();
+ if ((quantity>0?currentCount + Integer.valueOf(item.get("quantity").toString()) <= quantity:true)
+ && (area>0?currentArea + Double.valueOf(item.get("area").toString()) <= area:true)) {
+ if(i+1==queueSize){
+ processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString();
+ }else{
+ processId=processId+item.get("process_id").toString()+"/"+item.get("technology_number").toString()+";";
+ }
+ currentGroup.add(item);
+ currentCount += Integer.valueOf(item.get("quantity").toString());
+ currentArea += Double.valueOf(item.get("area").toString());
+ addedAny = true;
+ } else {
+ queue.offer(item); // 鏀惧洖闃熷垪绛夊緟涓嬫澶勭悊
+ }
+ }
+
+ if (currentGroup.isEmpty()) {
+ throw new RuntimeException("鏃犳硶缁х画鍒嗙粍锛屽墿浣欐暟鎹棤娉曟斁鍏ヤ换浣曞垎缁�");
+ }
+ currentGroupMap.put("processId",processId);
+ currentGroupMap.put("count",currentCount);
+ currentGroupMap.put("area",Math.round(currentArea * 100) / 100.0);
+ result.add(currentGroupMap);
+ //System.out.println("娴佺▼鍗�:"+processId+"鏁伴噺:"+currentCount+"闈㈢Н:"+Math.round(currentArea * 100) / 100.0);
+ }
+
+ for (Map<String, Object> objectMap:result){
+ Map<String,Object> map = new HashMap<>();
+ String[] substrings = objectMap.get("processId").toString().split(";");
+ List<Map<String, Object>> flowCardMap = new ArrayList<>();
+ List<String> processIdList=new ArrayList<>();
+ List<Integer> technologyNumberList=new ArrayList<>();
+ for(String substring : substrings) {
+ String processId = substring.substring(0, 14);
+ Integer technologyNumber = Integer.valueOf(substring.substring(15));
+ processIdList.add(processId);
+ technologyNumberList.add(technologyNumber);
+ }
+ map.put("data",glassOptimizeMapper.simulatedTypesettingUsingOpt(processIdList,technologyNumberList));
+ objectMap.put("cuttingRate",90);
+ }
+ System.out.println(result);
+
+ return "";
+
+ }
+
+
+
+
+
+
+
+
+
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ public Map<String, Object>selectProjectComputeMpThirdParty(String projectNumber) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.selectProjectComputeMpThirdParty(projectNumber));
+ return map;
+ }
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ public Map<String, Object>selectComputeDetailThirdParty(String processId,Integer technologyNumber) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.selectComputeDetailMpThirdParty(processId,technologyNumber));
+ return map;
+ }
+
+ public Boolean simulationSaveThirdParty(Map<String, Object> object) {
+ try {
+ Map<String, Object> objectMap = (Map<String, Object>) object.get("inputValues");
+ String projectNo = objectMap.get("project_no").toString();
+ Map<String, Object> optimizeProjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+ glassOptimizeMapper.addSimulation(object);
+ glassOptimizeMapper.addratioResult(object);
+ glassOptimizeMapper.addratioProjectResult(object);
+
+ 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) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ //鍒犻櫎宸ョ▼
+ public boolean deleteProjectThirdParty(String projectNumber) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+ if(stringObjectMap.get("state").equals(2)){
+ glassOptimizeMapper.deleteOptimizeDetailThirdParty(projectNumber);
+ glassOptimizeMapper.deleteOptimizeDetail(projectNumber);
+ }else if(stringObjectMap.get("state").equals(10)){
+ glassOptimizeMapper.deleteOptimizeDetailThirdParty(projectNumber);
+ glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
+ glassOptimizeMapper.deleteOptimizeHeatLayout(projectNumber);
+ }
+ glassOptimizeMapper.deleteProjectMp(projectNumber);
+
+ return true;
+ }
+
+ //宸ョ▼淇℃伅
+ public Map<String, Object> projectInfoThirdParty(String projectNo) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
+ Map<String, Object> map = new HashMap<>();
+ if(stringObjectMap.get("state").equals(2)){
+ map.put("data", glassOptimizeMapper.firstOptimizationThirdParty(projectNo));
+ map.put("grindingTrimming", null);
+ }else{
+ map.put("data", glassOptimizeMapper.firstOptimizationThirdParty(projectNo));
+ map.put("grindingTrimming", null);
+ }
+ return map;
+ }
+
+ //搴撳瓨淇℃伅
+ public Map<String, Object> materialStoreSvThirdParty(String projectNumber) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
+ map.put("edgeTrimming", null);
+ map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
+ return map;
+ }
+
+ //宸ョ▼淇℃伅娴佺▼鍗�
+ public Map<String, Object> getProcessCardMpThirdParty(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProcessCardMpThirdParty(projectNo));
+ return map;
+ }
+
+
+ public Map<String, Object> getProjectByProjectNoSv(String projectNo) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", glassOptimizeMapper.getProjectByProjectNoSv(projectNo));
+ return map;
+ }
+
}
--
Gitblit v1.8.0