Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-10-30 cbf12607ca1179d98f76d9b3a475d6224e85d59a

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

@@ -1,9 +1,11 @@
package com.mes.pp.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.uppattenusage.entity.UpPattenUsage;
import io.swagger.models.auth.In;

import java.util.List;

@@ -19,17 +21,68 @@

    /**
     * 查询可领取的任务工程信息
     * @return
     *
     * @return List<OptimizeProject>
     */
    List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
    /**
     * 将工程信息保存到原片使用详情表
     * @return
     */
    void insetupPattenUsage(List<OptimizeProject> glass);

    /**
     * 将工程信息更新状态为已领取
     * @return
     */
    void changeTask(String engineeringId, int i);

    /**
     * 完成工程任务改为300
     *
     * @return
     */
    boolean overTask(UpPattenUsage sequence, int state);

    /**
     * 获取正在进行中的任务
     *
     * @return
     */
    List<OptimizeProject> getDoingTask();

    /**
     * 查询工程信息
     *
     * @return
     */
    List<OptimizeProject> queryEngineer();

    /**
     * 查询工程排序信息
     *
     * @return
     */
    List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject);

    /**
     * 更新工程排产信息
     *
     * @return
     */
    List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> engineerList);

    /**
     * 更新工程排产信息
     *
     * @return
     */
    List<OptimizeProject> updateCuttingLayout(Integer type, List<OptimizeProject> engineerList);

    /**
     * 删除工程排产信息
     *
     * @return
     */
    void deleteengineerSchedulingByid(String engineerId, List<Integer> types);
    /**
     * 查询工程进度
     *
     * @return ProgressDTO
     */
     List<ProgressDTO> selectProgress(String engineerId);
}