电路站点报告ing

zss

2024-09-27 a14a26c04bc5863248b9a9d387610a143c3a4efd

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

@@ -10,10 +10,7 @@
import com.yuanchu.mom.dto.InsProductResultDto;
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.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.InsProductResultVo;
import com.yuanchu.mom.vo.Result;
@@ -39,6 +36,7 @@
public class InsOrderPlanController {

    private InsOrderPlanService insOrderPlanService;
    private InsOrderUserService insOrderUserService;

    private InsOrderFileService insOrderFileService;

@@ -117,8 +115,8 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId,String laboratory, Integer verifyUser, String entrustCode) {
        int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
    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);
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

@@ -212,11 +210,39 @@
        return Result.success(insOrderStateService.updateById(orderState));
    }

    @ValueClassify("检验任务")
    @ValueAuth
    @PostMapping("/getInsOrderUserList")
    @ApiOperation("查看检验历史列表")
    public Result<?> getInsOrderUserList(Integer insOrderStateId) {
        return Result.success(insOrderPlanService.getInsOrderUserList(insOrderStateId));
    }

    @ValueAuth
    @PostMapping("/getInsProduct2")
    @ApiOperation("查看检验历史")
    public Result<?> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
        return Result.success(insOrderPlanService.getInsProduct2(id, type, laboratory, request,num));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码报检(入库)")
    @PostMapping("/scanInsOrderState")
    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));
    }

}