feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制

liding

2 天以前 901bab9b8b1c3773a644bdc74f5eafd666591aeb

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java

@@ -2,18 +2,17 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.basic.service.*;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.dto.AddStandardTreeNodeDto;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.dto.StandardLibraryTreeNodeDto;
import com.ruoyi.basic.dto.UpdateStandardTreeNodeDto;
import com.ruoyi.basic.dto.StandardTreeTemplateBindingDto;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,7 +32,7 @@

    private StandardTreeService standardTreeService;

    private StandardMethodListService standardMethodListService;
    private StandardMethodService standardMethodService;

    private StandardProductListService standardProductListService;

@@ -53,14 +52,17 @@

    @ApiOperation(value = "添加标准树")
    @PostMapping("/addStandardTree")
    public Result addStandardTree(@RequestBody StandardTree standardTree) {
        return Result.success(standardTreeService.addStandardTree(standardTree));
    public Result addStandardTree(@RequestBody AddStandardTreeNodeDto dto) {
        return Result.success(standardTreeService.addStandardTree(dto));
    }

    @ApiOperation(value = "根据标准树进行标准查询")
    @GetMapping("/selectsStandardMethodByFLSSM")
    public Result selectsStandardMethodByFLSSM(String tree) {
        return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
        if (tree == null || tree.trim().isEmpty()) {
            return Result.fail("标准树参数不能为空");
        }
        return Result.success(standardMethodService.selectsStandardMethodByFLSSM(tree));
    }

    @ApiOperation(value = "修改标准库中的内容")
@@ -93,8 +95,8 @@

    @ApiOperation(value = "通过检验标准查询检验项目")
    @GetMapping("/selectStandardProductListByMethodId")
    public Result selectStandardProductListByMethodId(Integer id, String tree) {
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
    public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page, keyword));
    }

    @ApiOperation(value = "批量查询检验项目")
@@ -112,7 +114,7 @@
    @ApiOperation(value = "获取标准树下标准方法枚举")
    @GetMapping("/selectStandardMethodEnum")
    public Result selectStandardMethodEnum() {
        return Result.success(standardMethodListService.selectStandardMethodEnum());
        return Result.success(standardMethodService.selectStandardMethodEnum());
    }

    @ApiOperation(value = "获取产品架构")
@@ -131,49 +133,6 @@
        return Result.success(standardTreeService.upStandardProducts(product));
    }

    @ApiOperation("仅获取光纤的型号")
    @GetMapping("/getStandTreeBySampleType")
    public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
        return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
    }

    @ApiOperation("导入标准库")
    @PostMapping("/inExcelOfTree/{isEquipment}")
    public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
        if (!isEquipment) {
            standardTreeService.inExcelOfTree(file);
        } else {
            standardTreeService.importWorkstationExcel(file);
        }
        return Result.success();
    }

    @ApiOperation("重置标准库单价")
    @PostMapping("/resetTreeOfPrice")
    public Result resetTreeOfPrice(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfPrice(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库工时系数")
    @PostMapping("/resetTreeOfHour")
    public Result resetTreeOfHour(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfHour(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库要求描述和要求值")
    @PostMapping("/resetTreeOfAsk")
    public Result resetTreeOfAsk(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfAsk(tree, standardId);
        return Result.success();
    }

    @ApiOperation("标准库拖拽")
    @PostMapping("/resetTreeDrag")
@@ -192,7 +151,7 @@

    @ApiOperation(value = "标准树排序")
    @PostMapping("/updateTreeSort")
    public Result updateTreeSort(@RequestBody List<FactoryDto> list) {
    public Result updateTreeSort(@RequestBody List<StandardLibraryTreeNodeDto> list) {
        return Result.success(standardTreeService.updateTreeSort(list));
    }

@@ -230,8 +189,20 @@

    @ApiOperation(value = "修改标准树")
    @PostMapping("/updateStandardTree")
    public Result updateStandardTree(@RequestBody StandardTree standardTree) {
        return Result.success(standardTreeService.updateStandardTree(standardTree));
    public Result updateStandardTree(@RequestBody UpdateStandardTreeNodeDto dto) {
        return Result.success(standardTreeService.updateStandardTree(dto));
    }

    @ApiOperation(value = "查询标准绑定的原始记录模板")
    @GetMapping("/selectTemplateBindings")
    public Result selectTemplateBindings(Integer standardTreeId) {
        return Result.success(standardTreeService.selectTemplateBindings(standardTreeId));
    }

    @ApiOperation(value = "保存标准绑定的原始记录模板")
    @PostMapping("/saveTemplateBindings")
    public Result saveTemplateBindings(@RequestBody StandardTreeTemplateBindingDto dto) {
        return Result.success(standardTreeService.saveTemplateBindings(dto));
    }

    @ApiOperation(value = "检验项要求值复制对比")