jiangping
2023-10-26 6c10ea02b732952d578a00856dbb994b21539606
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -4,10 +4,12 @@
import doumeemes.api.BaseController;
import doumeemes.config.rocketmq.RocketMessageProducer;
import doumeemes.core.annotation.pr.PreventRepeat;
import doumeemes.core.annotation.trace.Trace;
import doumeemes.core.model.ApiResponse;
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;
@@ -42,6 +44,7 @@
@RestController
@RequestMapping("/ext/workorderRecordExt")
@Api(tags = "工单生产过程记录接口")
@Trace(withRequestResult = false,withRequestParameters = false)
public class   WorkorderRecordExtController extends BaseController {
    @Autowired
@@ -83,19 +86,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("新建产出")
@@ -169,12 +183,18 @@
    @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) {