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 | 279 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 230 insertions(+), 49 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 f79fbea..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,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;
@@ -28,6 +30,7 @@
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;
@@ -123,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) {
@@ -137,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();
@@ -153,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();
@@ -182,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.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());
+// 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;
}
@@ -211,10 +378,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){
@@ -222,21 +389,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;
}
@@ -278,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){
@@ -314,11 +474,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);
}
@@ -426,11 +590,25 @@
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);
+ 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();
@@ -485,30 +663,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;
@@ -708,7 +886,10 @@
}
-
-
+ 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