From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 06 十二月 2023 08:41:32 +0800 Subject: [PATCH] bug --- server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java index f3ffd3a..13fd35d 100644 --- a/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java +++ b/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,13 +28,18 @@ 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); - WorkorderRecord createWorkorderRecord(CreateWorkorderRecordDTO createWorkorderRecordDTO, LoginUserInfo loginUserInfo); + WorkorderRecord createWorkorderRecord(CreateWorkorderRecordDTO createWorkorderRecordDTO, LoginUserInfo loginUserInfo,Integer userId); List<WorkorderRecord> getWorkorderRecordList(Integer workorderId); PageData<WStockExtListVO> choiceStockPageForWorkorder(PageWrap<QueryWStockDto> pageWrap, LoginUserInfo userInfo); + + PageData<WStockExtListVO> choiceStockPageForPlans(PageWrap<QueryWStockDto> pageWrap,LoginUserInfo userInfo); } -- Gitblit v1.9.3