From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..59d39b7 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();
@@ -671,7 +672,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 +691,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