From 24888c4b2ca2ffc49c4d94aefd6aea32d515b6dd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 20 四月 2025 14:17:24 +0800
Subject: [PATCH] 分架明细报表修改查询问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 216 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 163 insertions(+), 53 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..81ffb3e 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
@@ -7,9 +7,11 @@
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.PatchLog;
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;
@@ -24,10 +26,13 @@
import java.util.concurrent.TimeoutException;
@Service
+@Transactional(rollbackFor = Exception.class)
@DS("sd")
public class GlassOptimizeService {
@Autowired
GlassOptimizeMapper glassOptimizeMapper;
+ @Autowired
+ SysErrorService sysErrorService;
RabbitMQUtil rabbitMQUtil;
//妯℃嫙璁＄畻
@@ -40,10 +45,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);
@@ -131,14 +136,14 @@
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());
+ map.put("data", glassOptimizeMapper.firstOptimization(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
}else if(stringObjectMap.get("state").equals(10)){
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
- map.put("grindingTrimming", glassOptimizeMapper.getEdgeTrimming());
+ map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
}else{
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
- map.put("grindingTrimming", null);
+ map.put("data", glassOptimizeMapper.analogComputationOptimization(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming());
}
return map;
}
@@ -152,17 +157,32 @@
}
//搴撳瓨淇℃伅
- public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber) {
+ public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber,Integer type) {
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));
+ 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());
+ }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());
}else{
map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
map.put("edgeTrimming", null);
}
-
+ map.put("state", Integer.parseInt(stringObjectMap.get("state").toString()));
return map;
}
@@ -176,6 +196,20 @@
map.put("data", glassOptimizeMapper.getFlowCardListNormal(optionVal));
}else{
map.put("data", glassOptimizeMapper.getFlowCardListPatch(optionVal));
+ }
+
+
+ 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));
}
@@ -224,7 +258,7 @@
}
//鍒犻櫎宸ョ▼
- 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)){
glassOptimizeMapper.deleteOptimizeHeatDetail(projectNumber);
@@ -235,10 +269,21 @@
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 +302,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,42 +344,91 @@
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);
+ }
+ for (FlowCard flowCard : flowCardList) {
+ if(flowCard.getPatchState().equals(0)){
+ state1=1;
+ //缁欐祦绋嬪崱琛ㄦ坊鍔犲搴旂殑宸ョ▼鍙�
+ Boolean a=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(";");
+ }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) {
--
Gitblit v1.8.0