Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044

 server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java

@@ -8,16 +8,17 @@
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;
import doumeemes.dao.business.model.WorkorderRecord;
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.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;
@@ -83,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("新建产出")
@@ -140,6 +152,18 @@
    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")
    public ApiResponse<PageData<SalaryStatisticsListVO>> salaryStatistic (@RequestBody PageWrap<QuerySalaryStatisticDTO> pageWrap) {
        return ApiResponse.success(workorderRecordExtService.salaryStatistic(pageWrap));
    }

    @ApiOperation("查询全部")
    @PostMapping("/all")
@@ -162,6 +186,16 @@
   // @RequiresPermissions("ext:workorderrecordext:exportExcel")
    public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
        workorderRecordExtService.exportExcel(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查询")
@@ -202,6 +236,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()));
    }

}