工时调整+标签打印调整+特殊项的保存

zss

2024-10-15 f747fddabf9195706eef73c4ca233c881b7dfe75

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -8,8 +8,10 @@
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.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
@@ -115,8 +117,8 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode, String note,String term) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,note,term);
    public Result<?> submitPlan(@RequestBody SubmitPlanDto submitPlanDto) {
        int num = insOrderPlanService.submitPlan(submitPlanDto);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

@@ -134,6 +136,20 @@
        Map<String, Object> param2 = JSON.parseObject(param, Map.class);
        insOrderPlanService.saveInsContext(param2,num);
        return Result.success();
    }

    @ApiOperation(value = "电路试验的保存检验内容")
    @PostMapping("/saveInsContext2")
    @ValueAuth
    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
    }

    @ApiOperation(value = "温湿度试验+功率试验的保存检验内容")
    @PostMapping("/saveInsContext3")
    @ValueAuth
    public Result<?> saveInsContext3(@RequestBody InsProductResult insProductResult) {
        return Result.success(insOrderPlanService.saveInsContext3(insProductResult));
    }

    @ValueAuth
@@ -186,13 +202,6 @@
        return Result.success(insOrderStateService.jumpTeam(insOrderState));
    }

    @ApiOperation(value = "电路试验的保存检验内容")
    @PostMapping("/saveInsContext2")
    @ValueAuth
    public Result<?> saveInsContext2(@RequestBody InsProductResultDto insProductResultDtos) {
        return Result.success(insOrderPlanService.saveInsContext2(insProductResultDtos));
    }

    @ApiOperation(value = "电路试验的删除频段")
    @PostMapping("/deleteInsContext")
    @ValueAuth
@@ -225,10 +234,24 @@
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码报检")
    @ApiOperation(value = "扫码报检(入库)")
    @PostMapping("/scanInsOrderState")
    public Result scanInsOrderState(String sonLaboratory,String sampleCode) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode));
    public Result scanInsOrderState(String sonLaboratory,String sampleCode,String trees) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory,sampleCode,trees));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码出库")
    @PostMapping("/outInsOrderState")
    public Result outInsOrderState(String sonLaboratory,String sampleCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory,sampleCode));
    }

    @ValueAuth
    @PostMapping("/preview")
    @ApiOperation("预览文件")
    public Result<?> preview(Integer id)throws Exception {
        return Result.success(insOrderPlanService.preview(id));
    }

}