Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

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

@@ -1,6 +1,5 @@
package com.mes.damage.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
@@ -8,7 +7,6 @@
import com.mes.pp.entity.ReportingWorkDetail;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -22,10 +20,20 @@

    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);

//    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);

    void submitDamage(List<Damage> damageList);

    void submitReport(Damage damage);
    Boolean submitReport(Damage damage);

    /**
     * 按照玻璃id信息自动报工
     * @param glassId
     * @param deviceId
     * @param workingProcedure
     * @param remark
     */
    void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark);
    /**
     * 单个破损
     *
@@ -46,5 +54,5 @@

    void deleteByGlassId(String glassId);

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