From 30e2ad8ca10dd49901c52da26f166d32ee4e8454 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 10 四月 2025 09:23:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 15 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..9892b34 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,6 +7,7 @@
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;
@@ -131,14 +132,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;
}
@@ -176,6 +177,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));
}
@@ -235,9 +250,18 @@
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);
+ }
}
+ if(patchLogList!=null){
+ for (PatchLog patchLog:patchLogList){
+ glassOptimizeMapper.updatePatchLogProjectReturn(patchLog.getProcessId(),patchLog.getTechnologyNumber(),projectNumber);
+ }
+ }
+
glassOptimizeMapper.deleteProjectMp(projectNumber);
return true;
}
@@ -288,23 +312,48 @@
if (object.get("userName") != null) {
userName = object.get("userName").toString();
}
+ 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 = 1;
+ 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);
+ }
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(";");
+ 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" 鍓嶉潰鐨勯儴鍒�
--
Gitblit v1.8.0