复核确认+插队+认领判断是否在库

zss

2024-08-26 8bf55e1ac0ac6eb6c97a025f0c03b78e208f668e

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

@@ -7,8 +7,10 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.service.InsOrderFileService;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderStateService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -36,6 +38,7 @@
    private InsOrderFileService insOrderFileService;

    private InsProductService insProductService;
    private InsOrderStateService insOrderStateService;

    @ValueClassify("检验任务")
    @ApiOperation(value = "获取检验任务列表")
@@ -71,7 +74,7 @@
        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
    }

    @ApiOperation(value = "切换光纤/光纤带记录模版查询检验内容")
    @ApiOperation(value = "切换套管/光纤/光纤带记录模版查询检验内容")
    @PostMapping("/getReportModel")
    @ValueAuth
    public Result<?> getReportModel(Integer sampleId) {
@@ -116,7 +119,7 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
    public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }
@@ -186,4 +189,14 @@
    public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
        return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "插队操作")
    @PostMapping("/jumpTeam")
    public Result<?> jumpTeam(Integer orderStateId,Integer sort) {
        InsOrderState orderState = new InsOrderState();
        orderState.setId(orderStateId);
        orderState.setSort(sort);
        return Result.success(insOrderStateService.updateById(orderState));
    }
}