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 | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 172 insertions(+), 27 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 91f35f3..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
@@ -1,21 +1,32 @@
package com.mes.pp.service.impl;
+import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
+import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import java.util.Collections;
+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>
@@ -28,41 +39,175 @@
@Service
@DS("pp")
@Slf4j
-public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+ @Autowired
+ private EngineeringService engineeringService;
+ @Autowired
+ private EngineerSchedulingService engineerSchedulingService;
- @Resource
- UpPattenUsageMapper upPattenUsageMapper;
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
- log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
+ //PP琛ㄦ湭寮�濮嬬殑宸ョ▼鍙�
+ // 璁＄畻浜屼釜鏈堝墠鐨勬椂闂�
+ LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
- .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
- //.groupBy(OptimizeProject::getProjectNo)
- ;
- log.info("杩斿洖宸ョ▼淇℃伅");
+ wrapper.select(OptimizeProject::getProjectNo, OptimizeProject::getProjectName)
+ .eq(OptimizeProject::getState, optimizeRequest.getState())
+ .ge(OptimizeProject::getCreateTime, twoMonthAgo);
+ List<OptimizeProject> glass = this.list(wrapper);
+ //鏆傚仠鐨勫伐绋嬪彿
+ List<Engineering> engineerings = engineeringService.selectTask();
+
+
+ for (int i = 0; i < engineerings.size(); i++) {
+ Engineering engineering = engineerings.get(i);
+ OptimizeProject newProject = new OptimizeProject();
+ newProject.setProjectNo(engineering.getEngineerId());
+ newProject.setProjectName(engineering.getEngineerName());
+ // 灏嗘柊鍒涘缓鐨� OptimizeProject 瀵硅薄娣诲姞鍒� glass 鍒楄〃涓�
+ glass.add(newProject);
+ }
+ //杩斿洖宸ョ▼淇℃伅
+ return glass;
+ }
+
+
+ @Override
+ public void changeTask(String engineeringId, int state) {
+ UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+ wrapper.eq("project_no", engineeringId)
+ .set("state", state);
+ boolean updateSuccess = this.update(wrapper);
+ log.info("宸ョ▼琛ㄦ洿鏂扮姸鎬亄}", updateSuccess);
+
+ }
+
+ @Override
+ public boolean overTask(UpPattenUsage sequence, int state) {
+ if (sequence.getState() == 100) {
+ UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+ wrapper.eq("project_no", sequence.getEngineeringId())
+ .set("state", state);
+ boolean updateSuccess = this.update(wrapper);
+ log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}", updateSuccess);
+ }
+ return false;
+ }
+
+ @Override
+ public List<OptimizeProject> getDoingTask() {
+ QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
+ wrapper.select("project_no,project_name")
+ .eq("state", 200);
return this.list(wrapper);
}
+ @Override
+ public List<OptimizeProject> queryEngineer() {
+ return this.baseMapper.queryEngineer();
+ }
@Override
- public void insetupPattenUsage(List<OptimizeProject> glass) {
- log.info("寰幆鏌ヨ缁撴灉淇濆瓨鍒癠pPattenUsage琛ㄤ腑");
- for (OptimizeProject project : glass) {
- UpPattenUsage upPattenUsage = new UpPattenUsage();
- upPattenUsage.setEngineeringId(project.getProjectNo());
- upPattenUsage.setFilmsId(project.getGlassType());
- upPattenUsage.setState(project.getState());
- upPattenUsageMapper.insert(upPattenUsage);
+ public List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject) {
+ return this.baseMapper.engineerScheduling(optimizeProject);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> projectList) {
+ // 1. 鍒犻櫎瀵瑰簲绫诲瀷鐨勬暟鎹�
+ baseMapper.deleteByType(type);
+ // 2. 璁剧疆鍊�
+ projectList.forEach(project -> {
+ project.setType(type);
+ project.setState(100);
+ project.setId(null); // 娓呴櫎ID
+ });
+ if (CollectionUtils.isNotEmpty(projectList)) {
+ // 3. 鎵归噺鎻掑叆鏂版暟鎹�
+ baseMapper.batchInsert(projectList);
}
+
+ 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 List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest) {
- log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
-
- log.info("杩斿洖宸ョ▼淇℃伅");
- return this.baseMapper.saveProject(optimizeRequest);
+ public void deleteengineerSchedulingByid(String engineerId, List<Integer> types) {
+ baseMapper.deleteByScheduling(engineerId, types);
}
+ @Override
+ public List<ProgressDTO> selectProgress(String engineerId) {
+ return baseMapper.selectProgress(engineerId);
+ }
}
--
Gitblit v1.8.0