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 | 91 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 insertions(+), 18 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 c890126..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
@@ -312,22 +312,60 @@
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("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));
+// 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;
}
@@ -552,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();
@@ -834,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