From a8bddf65438ac58787c5b4abee5da145a2d9d2ab Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 28 十月 2025 09:44:27 +0800
Subject: [PATCH] 增加新切割保存方法、前端显示防错位、切割钢化排产防重复、根据标签切换接口
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index f705d85..f6c14db 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.engineerScheduling.entity.EngineerScheduling;
+import com.mes.engineerScheduling.service.EngineerSchedulingService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
@@ -20,7 +22,11 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -36,6 +42,8 @@
public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
@Autowired
private EngineeringService engineeringService;
+ @Autowired
+ private EngineerSchedulingService engineerSchedulingService;
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
@@ -109,7 +117,6 @@
public List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> projectList) {
// 1. 鍒犻櫎瀵瑰簲绫诲瀷鐨勬暟鎹�
baseMapper.deleteByType(type);
-
// 2. 璁剧疆鍊�
projectList.forEach(project -> {
project.setType(type);
@@ -123,6 +130,76 @@
return projectList;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @DS("north_glass_mes")
+ public List<OptimizeProject> updateCuttingLayout(Integer type, List<OptimizeProject> projectList) {
+ //鑾峰彇褰撳墠閽㈠寲鎺掔増淇℃伅
+ List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(3);
+ List<EngineerScheduling> cutting = new ArrayList<>();
+ if(type==1){
+ cutting = engineerSchedulingService.queryByType(2);
+ }else {
+ cutting = engineerSchedulingService.queryByType(1);
+ }
+ //淇濆瓨鏂板閽㈠寲鎺掔増淇℃伅
+ List<EngineerScheduling> newSchedulingList = new ArrayList<>();
+ Set<String> existingProjectNoSet = engineerScheduling.stream()
+ .map(EngineerScheduling::getProjectNo)
+ .collect(Collectors.toSet());
+ // 鑾峰彇褰撳墠鎺掔増鏂板宸ョ▼
+ for (OptimizeProject project : projectList) {
+ String projectNo = project.getProjectNo();
+ // 宸ョ▼鍙烽潪绌猴紝涓斾笉鍦ㄥ凡鏈夐挗鍖栨帓浜ф暟鎹腑
+ if (projectNo != null && !existingProjectNoSet.contains(projectNo)) {
+ EngineerScheduling newEs = new EngineerScheduling();
+ newEs.setProjectNo(projectNo);
+ newEs.setProjectName(project.getProjectName());
+ newEs.setType(3);
+ newEs.setState(100);
+ newSchedulingList.add(newEs);
+ }
+ }
+ //鑾峰彇褰撳墠鎺掔増鍙栨秷宸ョ▼
+ Set<String> cuttingProjectNos = new HashSet<>();
+ for (EngineerScheduling es : cutting) {
+ if (es.getProjectNo() != null) { // 閬垮厤绌烘寚閽�
+ cuttingProjectNos.add(es.getProjectNo());
+ }
+ }
+ engineerScheduling = engineerScheduling.stream()
+ .filter(es -> es.getProjectNo() == null || !cuttingProjectNos.contains(es.getProjectNo()))
+ .collect(Collectors.toList());
+ //1鍙风嚎閽㈠寲鏁版嵁瀵规瘮1鍙风嚎鍒囧壊鏁版嵁
+ Set<String> projectNoSet2 = new HashSet<>();
+ for (OptimizeProject project : projectList) {
+ String projectNo = project.getProjectNo();
+ if (projectNo != null) { // 閬垮厤绌烘寚閽�
+ projectNoSet2.add(projectNo);
+ }
+ }
+ // 2. 绛涢�夊苟鏀堕泦绗﹀悎鏉′欢鐨勫伐绋嬪彿锛圫tring绫诲瀷锛夊埌 List<String>
+ List<String> missingProjectNos = engineerScheduling.stream()
+ .map(EngineerScheduling::getProjectNo) // 鎻愬彇 engineerScheduling 涓殑宸ョ▼鍙�
+ .filter(esProjectNo -> esProjectNo != null // 鎺掗櫎绌哄伐绋嬪彿
+ && !projectNoSet2.contains(esProjectNo)) // 鎺掗櫎 projectList 涓瓨鍦ㄧ殑宸ョ▼鍙�
+ .collect(Collectors.toList()); // 鏀堕泦缁撴灉鍒� List<String>
+ for (OptimizeProject project : projectList) {
+ project.setType(type);
+ project.setState(100);
+ }
+ //鏂板閽㈠寲鎺掔増鏁版嵁
+ engineerSchedulingService.saveBatch(newSchedulingList);
+ //鏇存柊宸插彇娑堢殑閽㈠寲鎺掔増鐘舵��
+ if(CollectionUtils.isNotEmpty(missingProjectNos)){
+ engineerSchedulingService.updateState(missingProjectNos);
+ }
+ //鍙栨秷褰撳墠绫诲瀷鐨勫伐绋嬫帓浜т俊鎭�
+ engineerSchedulingService.updateByType(type);
+ //淇濆瓨褰撳墠鏂板垏鍓叉帓鐗堟暟鎹�
+ baseMapper.batchInsert(projectList);
+ return projectList;
+ }
@Override
public void deleteengineerSchedulingByid(String engineerId, List<Integer> types) {
--
Gitblit v1.8.0