From 986e2fd11b5c0c22766ebe3f9b5f39a6fa4d8c9f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 26 May 2022 11:33:14 +0800 Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha --- zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java index 5c48a1a..871613a 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java @@ -72,6 +72,13 @@ */ public int modifyCancelProjServices(SysProjServices projServices); + /** + * 删除服务单中明细, 即项目/套餐 + * @param id + * @return + */ + public int deleteProjServiceItemById(Long id); + /** * 划扣 @@ -104,4 +111,15 @@ List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo); int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto); + + public boolean skipServiceOrderStep(String step); + + /** + * 确认服务单 + * @param id + * @return + */ + int confirmServiceOrder(Long id); + + int signService(SysProjServices services); } \ No newline at end of file -- Gitblit v1.9.1