Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-29 2fe150d7351d329fd1bae4f8ef9cbdfc9c172362

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java

@@ -2,16 +2,15 @@


import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -23,6 +22,7 @@
 * @author zhoush
 * @since 2024-04-16
 */
@Api(tags = "工程信息")
@RestController
@RequestMapping("/optimizeProject")
@Slf4j
@@ -33,17 +33,61 @@

    @ApiOperation("显示工程选择信息")
    @PostMapping("/listByState") //显示工程选择信息
    @ResponseBody
    public Result<List<OptimizeProject>> listByState(@RequestBody OptimizeRequest optimizeRequest) {
        log.info("将请求参数封装在请求类里面");
        List<OptimizeProject> glass = optimizeProjectService.listByState(optimizeRequest);

        log.info("显示工程选择信息:{}", glass);
        return Result.build(200, "", glass);
    }

    @ApiOperation("查询工程信息")
    @PostMapping("/queryEngineer") //显示工程信息 pp表
    @ResponseBody
    public Result<List<OptimizeProject>> queryEngineer() {
        List<OptimizeProject> resultList = optimizeProjectService.queryEngineer();
        return Result.build(200, "", resultList);
    }

    @ApiOperation("查询工程排产信息")
    @PostMapping("/engineerScheduling") //显示工程排产信息 engineerScheduling表
    @ResponseBody
    public Result<List<OptimizeProject>> engineerScheduling(@RequestBody OptimizeProject optimizeProject) {
        List<OptimizeProject> engineerScheduling = optimizeProjectService.engineerScheduling(optimizeProject);
        return Result.build(200, "", engineerScheduling);
    }

    @ApiOperation("更新工程信息")
    @PostMapping("/updateEngineerScheduling") //更新工程排产信息 engineerScheduling表
    @ResponseBody
    public Result<List<OptimizeProject>> updateEngineerScheduling(@RequestParam Integer type, @RequestBody List<OptimizeProject> engineerList) {
        List<OptimizeProject> resultList = optimizeProjectService.updateEngineerScheduling(type, engineerList);
        return Result.build(200, "更新成功", resultList);
    }
    @ApiOperation("更新切割工程信息")
    @PostMapping("/updateCuttingLayout") //更新工程排产信息 engineerScheduling表
    @ResponseBody
    public Result<List<OptimizeProject>> updateCuttingLayout(@RequestParam Integer type, @RequestBody List<OptimizeProject> engineerList) {
        List<OptimizeProject> resultList = optimizeProjectService.updateCuttingLayout(type, engineerList);
        return Result.build(200, "更新成功", resultList);
    }
    @ApiOperation("查询工程进度")
    @PostMapping("/selectProgress") //更新工程排产信息 engineerScheduling表
    @ResponseBody
    public Result<List<ProgressDTO>> selectProgress(@RequestBody OptimizeRequest optimizeRequest) {
        List<ProgressDTO> resultList = optimizeProjectService.selectProgress(optimizeRequest.getProjectNo());
        return Result.build(200, "更新成功", resultList);
    }

//    @ApiOperation("保存工程信息")
//    @PostMapping("/saveProject") //显示工程选择信息
//    public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
//        log.info("将请求参数封装在请求类里面");
//        List<OptimizeProject> glass = optimizeProjectService.saveProject(optimizeRequest);
//        log.info("显示工程选择信息:{}", glass);
//        log.info("获取选择好的工程id进行查询数据后保存");
//        List<OptimizeProject> glass = optimizeProjectService.selectSaveProject(optimizeRequest);
//        log.info("显示工程选择信息后保存到upPattenUsage表:{}", glass);
//        optimizeProjectService.insetupPattenUsage(glass);
//        //void insetProject(glass);
//        return Result.build(200, "", glass);
//    }