From 40609a1bd11ce79445562ac23f16af23a48c3933 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java b/server/src/main/java/doumeemes/service/ext/WorkorderRecordStandardService.java
index 8473bf7..da60a55 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,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);
--
Gitblit v1.9.3