Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java

@@ -1,7 +1,8 @@
package com.mes.engineering.service;

import com.mes.engineering.entity.Engineering;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;

@@ -16,13 +17,56 @@
public interface EngineeringService extends IService<Engineering> {



    boolean  changeTask(String projectId, Integer state);


    /**
     * 开始/暂停任务
     * @return boolean
     */
    boolean changeTask(String projectId, Integer state);
    /**
     * 查询钢化信息
     * @return List<Engineering>
     */
    List<Engineering> selectEngineering(String engineeringId);

    void saveEngineering(List<Engineering> engineerings);
    /**
     * 保存钢化信息
     */
    void saveEngineering(List<Engineering> engineering);

    /**
     * 查询是否有上片任务
     *
     * @return Engineering
     */
    Engineering selectInitiate(Integer state);
    Engineering selectInitiates(Integer state,Integer cell);
    /**
     * 查询工程表是否已有工程号
     *
     * @return Engineering
     */
    Engineering selectUpInitiate(String engineerId);

    /**
     * 查询小片表是否已有工程号
     *
     * @return Engineering
     */
    GlassInfo selectGlassinfoIsnull(String engineerId);
    /**
     * 查询上片任务
     *
     * @return Engineering
     */
    List<Engineering> selectTask();

    boolean pauseTask(String engineerId, Integer state);

    boolean deleteTask(String engineerId);

    boolean changeTasks(Engineering engineering);



//    boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell);
}