From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3

---
 server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java |   62 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index 305e561..903c367 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -8,6 +8,7 @@
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.utils.Constants;
+import doumeemes.dao.business.dto.AutoWorkReportDTO;
 import doumeemes.dao.business.dto.CreateMaterialDTO;
 import doumeemes.dao.business.dto.DealWorkorderRecordDTO;
 import doumeemes.dao.business.model.Workorder;
@@ -15,11 +16,9 @@
 import doumeemes.dao.ext.bean.EndCheckApBean;
 import doumeemes.dao.ext.beanDto.QueryWStockDto;
 import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
+import doumeemes.dao.ext.dto.QueryUserSalaryListDTO;
 import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
-import doumeemes.dao.ext.vo.SalaryStatisticsListVO;
-import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
-import doumeemes.dao.ext.vo.WStockExtListVO;
-import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
+import doumeemes.dao.ext.vo.*;
 import doumeemes.service.business.WorkorderRecordService;
 import doumeemes.service.ext.WorkorderExtService;
 import doumeemes.service.ext.WorkorderRecordExtService;
@@ -85,19 +84,30 @@
         return ApiResponse.success(id);
     }
 
-
     @PreventRepeat
-    @ApiOperation("纭鎶ュ伐")
+    @ApiOperation(value = "纭鎶ュ伐" ,notes = "1.0.2鏇存柊")
     @PostMapping("/comfirmDoneStandard")
     @RequiresPermissions("ext:workorderrecordext:create")
-    public ApiResponse comfirmDoneStandard(@RequestBody Workorder param) {
-        Integer id =workorderRecordStandardService.comfirmDone(param);
+    public ApiResponse comfirmDoneStandard(@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
+        Workorder workorder =workorderRecordStandardService.comfirmDoneNew(autoWorkReportDTO,true);
         //鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣�
-        workorderExtService.statisticNum(param);
+        workorderExtService.statisticNumAsync(workorder);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+
+//    @PreventRepeat
+//    @ApiOperation("纭鎶ュ伐锛堝純鐢級")
+//    @PostMapping("/comfirmDoneStandard")
+//    @RequiresPermissions("ext:workorderrecordext:create")
+//    public ApiResponse comfirmDoneStandard(@RequestBody Workorder param) {
+//        Integer id =workorderRecordStandardService.comfirmDone(param,true);
+//        //鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣�
+//        workorderExtService.statisticNum(param);
 //        RocketMessageProducer.producerMsg(Constants.MQ_TAG.statistics,null, JSONObject.toJSONString(param));
 //        rabbitTemplate.convertAndSend(Constants.MqTopicKeys.TOPIC_STATISTIC_NUM, Constants.MqTopicKeys.TOPIC_STATISTIC_NUM, JSONObject.toJSONString(param));
-        return ApiResponse.success(id);
-    }
+//        return ApiResponse.success("");
+//    }
 
     @PreventRepeat
     @ApiOperation("鏂板缓浜у嚭")
@@ -142,6 +152,12 @@
     public ApiResponse<PageData<WorkorderRecordExtListVO>> findPage (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap) {
         return ApiResponse.success(workorderRecordExtService.findPage(pageWrap));
     }
+    @ApiOperation("鍛樺伐缁╂晥鍒嗛〉鏌ヨ")
+    @PostMapping("/userSalary")
+    @RequiresPermissions("ext:workorderrecordext:query")
+    public ApiResponse<PageData<UserSalaryListVO>> userSalaryPage (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap) {
+        return ApiResponse.success(workorderRecordExtService.userSalaryPage(pageWrap));
+    }
     @ApiOperation("宸ヨ祫鎶ヨ〃缁熻鍒嗛〉鏌ヨ")
     @PostMapping("/salaryStatistic")
     @RequiresPermissions("ext:workorderrecordext:query")
@@ -165,11 +181,27 @@
 
 
 
-    @ApiOperation("瀵煎嚭Excel")
+    @ApiOperation("鐢熶骇浜у嚭瀵煎嚭Excel")
     @PostMapping("/exportExcel")
    // @RequiresPermissions("ext:workorderrecordext:exportExcel")
     public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
         workorderRecordExtService.exportExcel(pageWrap,response);
+    }
+
+    @ApiOperation("鐢熶骇鎶曟枡瀵煎嚭Excel")
+    @PostMapping("/exportExcelFeeding")
+    public void exportExcelFeeding(@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response){
+        workorderRecordExtService.exportExcel2(pageWrap,response);
+    }
+    @ApiOperation("瀵煎嚭鍛樺伐缁╂晥鏄庣粏")
+    @PostMapping("/exportUserSalary")
+    public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
+        workorderRecordExtService.exportUserSalary(pageWrap,response);
+    }
+    @ApiOperation("瀵煎嚭宸ヨ祫鎶ヨ〃")
+    @PostMapping("/exportSalaryStatistics")
+    public void exportSalaryStatistics (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap, HttpServletResponse response) {
+        workorderRecordExtService.exportSalaryStatistics(pageWrap,response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -210,6 +242,10 @@
         return ApiResponse.success(workorderRecordStandardService.choiceStockPageForWorkorder(pageWrap,getLoginUser()));
     }
 
-
+    @ApiOperation("鏍规嵁渚涢渶璁″垝鏌ヨ鍙敤搴撳瓨")
+    @PostMapping("/getStockByPlansForStandard")
+    public ApiResponse<PageData<WStockExtListVO>> getStockByPlansForStandard (@RequestBody PageWrap<QueryWStockDto> pageWrap) {
+        return ApiResponse.success(workorderRecordStandardService.choiceStockPageForPlans(pageWrap,getLoginUser()));
+    }
 
 }

--
Gitblit v1.9.3