Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-24 bacec153f688bcee10795bd38f61b2406c20e488

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

@@ -20,9 +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);

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

    /**
     * 单个破损
@@ -44,5 +48,5 @@

    void deleteByGlassId(String glassId);

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