111

k94314517

2023-08-18 8dc8985eb32198788bef7ad21cf3f1726d840b6f

 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;
@@ -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("新建产出")