XiaoRuby
2023-08-03 fbba4ea24430b14eee18b190b7e08f1a58a8e504
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -8,6 +8,7 @@
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.service.*;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.*;
@@ -68,7 +69,7 @@
        return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
    }
    @ApiOperation("查询检验单里面的物料信息")
    @ApiOperation("查询检验单里面的样品信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "inspectionId", value = "报检单ID", dataTypeClass = String.class, required = true),
    })
@@ -80,11 +81,12 @@
    @ApiOperation("查询物料信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageSize", value = "页数", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "countSize", value = "条数/页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/selectMaterialLimit")
    public Result selectMaterialLimit(int pageSize, int countSize) {
        return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
    public Result selectMaterialLimit(int pageSize, int countSize, int type) {
        return Result.success(materialService.selectMaterialLimit(pageSize, countSize, type));
    }
    @ApiOperation("选择物料信息")
@@ -102,7 +104,8 @@
    })
    @PostMapping("/submitInspection")
    public Result submitInspection(String inspectionId) {
        return Result.success(inspectionService.subInspectionByInsId(inspectionId));
        inspectionService.subInspectionByInsId(inspectionId);
        return Result.success();
    }
    @ApiOperation("作废检验单申请")
@@ -111,6 +114,7 @@
    })
    @PostMapping("/delInspection")
    public Result delInspection(String inspectionId) {
        return Result.success(inspectionService.delInspectionByInsId(inspectionId));
        inspectionService.delInspectionByInsId(inspectionId);
        return Result.success();
    }
}