Merge remote-tracking branch 'origin/master'

zhoushihao

3 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java

@@ -10,7 +10,7 @@

/**
 * <p>
 *  服务类
 * 服务类
 * </p>
 *
 * @author wu
@@ -28,12 +28,14 @@

    /**
     * 按照玻璃id信息自动报工
     *
     * @param glassId
     * @param deviceId
     * @param workingProcedure
     * @param remark
     */
    void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark,int type);
    void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type);

    /**
     * 单个破损
     *
@@ -54,5 +56,5 @@

    void deleteByGlassId(String glassId);

    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type);
}