Merge remote-tracking branch 'origin/master'

k94314517

2023-08-18 eee82fc63bf8b0b48bda5d6c89a491974a20bc97

 server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java

@@ -3,6 +3,7 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.dto.CreateMaterialDTO;
import doumeemes.dao.business.dto.CreateWorkorderRecordDTO;
import doumeemes.dao.business.dto.DealWorkorderRecordDTO;
@@ -27,7 +28,10 @@

    List<WStockExtListForWorkorderVO> findAllForStandard(QueryWorkorderRecordExtDTO pageWrap);

    Integer comfirmDone(Workorder param);
    Integer comfirmDone(Workorder param,Boolean needCheck);


    Workorder comfirmDoneNew(AutoWorkReportDTO autoWorkReportDTO, Boolean needCheck);

    WorkorderRecord dealWorkorderRecord(DealWorkorderRecordDTO dealWorkorderRecordDTO, LoginUserInfo loginUserInfo);