From 4ecafe1bbc2f5da577f1f5dff307983f9fd71bde Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 九月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 8fa0fe5..2130651 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
@@ -348,7 +348,8 @@
}
glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
}
- glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);
+
+ glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -364,7 +365,9 @@
List<Map<String, Object>> objectMapList = (List<Map<String, Object>>) object.get("layouts");
Map<String, Object> glassInfo = glassOptimizeMapper.getGlassInfo(processId);
+ glassOptimizeMapper.deleteOffcutDetails(processId);
+ int stockId = 1;
for (Map<String, Object> objectMap : objectMapList) {
List<Map<String, Object>> objectMap2 = (List<Map<String, Object>>) objectMap.get("glassDetails");
@@ -405,18 +408,18 @@
}
}
- // 渚嬪瀵� remainDetails 閮ㄥ垎鍏堝垹闄� offcut 鍐嶅鐞�
+ // 瀵� remainDetails 閮ㄥ垎鍏堝垹闄� offcut 鍐嶅鐞�
if (!offCutDetails.isEmpty()) {
- glassOptimizeMapper.deleteOffcutDetails(processId);
if (glassInfo != null) {
String glassType = (String) glassInfo.get("glass_type");
String glassThickness = (String) glassInfo.get("glass_thickness");
// 浣欐枡瀛樺叆optimizeoffcut
for (Map<String, Object> detail : offCutDetails) {
- glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness);
+ glassOptimizeMapper.addUpdateOffcut(detail, processId, glassType, glassThickness, stockId);
}
}
}
+ stockId++;
}
// 鏇存柊浼樺寲缁撴灉鏂囦欢
String jsonString = mapper.writeValueAsString(object);
@@ -671,7 +674,7 @@
}
//淇敼鎺掔増鐘舵��
- public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) {
+ public Boolean updateProjectState(String projectNumber, Integer state,Integer states, Integer code) throws JsonProcessingException {
if (!projectNumber.isEmpty()) {
//鎾ら攢妯℃嫙璁＄畻
if(code==1){
@@ -690,7 +693,12 @@
}
//鍏佽鐢熶骇
else if(code==3){
- glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ Boolean isSeccess = issuingProjects(projectNumber);
+ if(isSeccess){
+ glassOptimizeMapper.updateProjectStateMp(projectNumber, state);
+ }else{
+ return false;
+ }
}
//鐢熶骇涓嶅彲瑙�
else if(code==4){
--
Gitblit v1.8.0