Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-24 bacec153f688bcee10795bd38f61b2406c20e488

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

@@ -3,6 +3,8 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;

import java.util.List;

@@ -18,7 +20,13 @@

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

    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);

    Boolean submitReport(Damage damage);

    /**
     * 单个破损
@@ -39,4 +47,6 @@
    List<DamagePrint> selectDamagePrintDetails(Damage damage);

    void deleteByGlassId(String glassId);

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