Merge remote-tracking branch 'origin/master'

zhoushihao

3 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -2,6 +2,7 @@

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

import java.util.List;

@@ -40,13 +41,19 @@
    Engineering selectInitiate(Integer state);
    Engineering selectInitiates(Integer state,Integer cell);
    /**
     * 查询是否有上片任务yw
     * 查询工程表是否已有工程号
     *
     * @return Engineering
     */
    Engineering selectUpInitiate(Integer state, Integer equipmentId);
    Engineering selectUpInitiate(String engineerId);

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