zss
2024-12-30 97bb7a8832281eafe0ef947ea095258d355e52f5
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
@@ -127,6 +124,13 @@
        return num == 1 ? Result.success() : Result.fail("提交失败,部分项目还未进行检验");
    }
    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务撤销提交")
    @PostMapping("/cancelSubmitPlan")
    public Result cancelSubmitPlan(Integer orderStateId) {
        return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
    }
    @ValueClassify("设备")
    @ApiOperation(value = "是否允许修改采集值")
    @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
@@ -148,6 +152,13 @@
    @ValueAuth
    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
    }
    @ApiOperation(value = "电路试验的保存检验内容(返回/提交)")
    @PostMapping("/saveInsContext2s")
    @ValueAuth
    public Result<?> saveInsContext2s(@RequestBody InsProductResultDtos insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2s(insProductResultDtos));
    }
    @ApiOperation(value = "温湿度试验+功率试验的保存检验内容")
@@ -242,15 +253,15 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码报检(入库)")
    @PostMapping("/scanInsOrderState")
    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees,String entrustCode) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees,entrustCode));
    }
    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码出库")
    @PostMapping("/outInsOrderState")
    public Result outInsOrderState(String sonLaboratory, String sampleCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
    public Result outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode,entrustCode));
    }
    @ValueAuth