Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-23 261698358e2b756a61e992bc1651e01b3f45290b

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

@@ -4,6 +4,7 @@
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.uppattenusage.entity.UpPattenUsage;
import io.swagger.models.auth.In;

import java.util.List;

@@ -19,6 +20,7 @@

    /**
     * 查询可领取的任务工程信息
     *
     * @return List<OptimizeProject>
     */
    List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
@@ -27,12 +29,14 @@
     * 将工程信息更新状态为已领取
     */
    void changeTask(String engineeringId, int i);

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

    /**
     * 获取正在进行中的任务
     *
@@ -42,20 +46,29 @@

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

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

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

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