Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java

@@ -1,14 +1,18 @@
package com.mes.hollow.controller;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.entity.request.HollowHistoryTaskRequest;
import com.mes.hollow.entity.request.HollowTaskRequest;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -29,7 +33,6 @@

    @Resource
    HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;

    @ApiOperation("领取任务")
    @PostMapping("/receiveTask")
    public Result<HollowGlassOutRelationInfo> receiveTask(HollowTaskRequest request) {
@@ -100,5 +103,11 @@
        return Result.build(200, "修改成功", hollowGlassOutRelationInfoService.generateHollowLisecFile(flowCardId, cell, isForce, 1));
    }

    @ApiOperation("获取中空任务队列")
    @PostMapping("/queryHollowHistoryTask")
    public Result<Page<HollowGlassOutRelationInfo>> queryHollowHistoryTask(@RequestBody @Validated HollowHistoryTaskRequest request) {
        return Result.build(200, "修改成功", hollowGlassOutRelationInfoService.queryHollowHistoryTask(request));
    }

}