From 62dc28f15134c54db886ae0226ed754b8c135ce5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 四月 2025 16:24:43 +0800
Subject: [PATCH] 修边磨量同步数据库
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 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 b80c6b2..8c480d4 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,18 +7,20 @@
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.userInfo.Log;
+import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.GlassOptimizeMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.DecimalFormat;
+import java.util.*;
import java.util.concurrent.TimeoutException;
@Service
@@ -126,8 +128,18 @@
//宸ョ▼淇℃伅
public Map<String, Object> projectInfoSv(String projectNo) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNo);
Map<String, Object> map = new HashMap<>();
- map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
+ if(Integer.parseInt(stringObjectMap.get("state").toString())<10){
+ map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getEdgeTrimming());
+ }else if(stringObjectMap.get("state").equals(10)){
+ map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
+ map.put("grindingTrimming", glassOptimizeMapper.getEdgeTrimming());
+ }else{
+ map.put("data", glassOptimizeMapper.projectInfoMp(projectNo));
+ map.put("grindingTrimming", null);
+ }
return map;
}
@@ -140,9 +152,17 @@
}
//搴撳瓨淇℃伅
- public Map<String, Object> materialStoreSv(String thickness, String model) {
+ public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber) {
+ Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
Map<String, Object> map = new HashMap<>();
- map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ if(Integer.parseInt(stringObjectMap.get("state").toString())<=10){
+ map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
+ }else{
+ map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
+ map.put("edgeTrimming", null);
+ }
+
return map;
}
@@ -306,11 +326,27 @@
if(type.equals("閽㈠寲")){
map.put("data", glassOptimizeMapper.getTemperedConfiguration());
}else if(type.equals("纾ㄩ噺")){
- map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ map.put("data", glassOptimizeMapper.getGrindingTrimming());
}else if(type.equals("淇竟")){
- map.put("data", glassOptimizeMapper.getTemperedConfiguration());
+ map.put("data", glassOptimizeMapper.getEdgeTrimming());
}
return map;
}
+
+ public Boolean saveConfiguration(Map<String,Object> object,String type) {
+ String json = "";
+ if (object.get("json") != null) {
+ json = object.get("json").toString();
+ }
+ if(type.equals("閽㈠寲")){
+ glassOptimizeMapper.updateOptimizeConfig(json,1);
+ } else if (type.equals("淇竟")) {
+ glassOptimizeMapper.updateOptimizeConfig(json,5);
+ }else if (type.equals("纾ㄩ噺")) {
+ glassOptimizeMapper.updateOptimizeConfig(json,4);
+ }
+ return true;
+
+ }
}
--
Gitblit v1.8.0