1、结束工程将工程由暂停更改为删除 2、优化获取工程增加时间限制 近两个月的工程信息

zhoushihao

2025-09-22 7ead430ad66b09305920171f0e4645b7a792cb6c

1、结束工程将工程由暂停更改为删除
2、优化获取工程增加时间限制 近两个月的工程信息

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java

@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -36,9 +37,12 @@
    @Override
    public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
        //PP表未开始的工程号
        // 计算二个月前的时间
        LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
        LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(OptimizeProject::getProjectNo)
                .eq(OptimizeProject::getState, optimizeRequest.getState());
                .eq(OptimizeProject::getState, optimizeRequest.getState())
                .ge(OptimizeProject::getCreateTime, twoMonthAgo);
        List<OptimizeProject> glass = this.list(wrapper);
        //暂停的工程号
        List<Engineering> engineerings = engineeringService.selectTask();

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -15,7 +15,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -129,8 +128,8 @@
//        glassInfoService.deleteTask(engineering.getEngineerId());
//        upPattenUsageService.deleteTask(engineering.getEngineerId());
//        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        //暂停工程
        engineeringService.pauseTask(engineering.getEngineerId(), 0);
        //暂停工程  - > 改为删除工程
        engineeringService.deleteTask(engineering.getEngineerId());
        //查询未上片的小片信息
        List<GlassInfo> glasslist = glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
        return Result.build(200, "删除成功" + engineering.getEngineerId(), glasslist);