检验修改

Fixiaobai

2023-08-30 d60b23554cb6f60c53df25d98cec4596421a59ab

检验修改

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java

@@ -7,6 +7,8 @@

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.mapper.InstrumentMapper;
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
@@ -177,9 +179,6 @@
    public Result delInspect(Integer id) {
        return Result.success(inspectionService.delInspect(id));
    }




}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java

@@ -1,13 +1,19 @@
package com.yuanchu.limslaboratory.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.service.*;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,7 +23,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -36,6 +44,18 @@

    @Autowired
    private RawMaterialService rawMaterialService;

    @Autowired
    private StandardService standardService;

    @Autowired
    private MaterialService materialService;

    @Resource
    private ProductMapper productMapper;

    @Resource
    private InspectionService inspectionService;

    @ApiOperation("查询所有检验计划分配")
    @ApiImplicitParams(value = {
@@ -77,4 +97,38 @@
        }
        return Result.fail("删除失败");
    }


    @ApiOperation("获取物料名称")
    @GetMapping("/getMaterielName")
    @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
    public Result<?> getMaterielName(){
        LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(Material::getId, Material::getName, Material::getCode);
        List<Map<String, Object>> maps = materialService.listMaps(wrapper);
        return Result.success(maps);
    }

    @ApiOperation("获取规格型号")
    @GetMapping("/specification")
    @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
    public Result<?> getSpecificationIdAndName(String materialId) {
        List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
        return Result.success(specificationIdAndName);
    }

    @ApiOperation("选择版本")
    @GetMapping("/chooseVer")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "name", value = "产品名称", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "mcode", value = "产品编号", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "specifications", value = "规格型号", dataTypeClass = String.class, required = true)
    })
    @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.reportForInspection,isAdd = true)
    public Result<?> chooseVer(String name, String mcode, String specifications) {
        return Result.success(inspectionService.chooseVer(name, mcode, specifications));
    }



}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java

@@ -91,6 +91,7 @@
    @NotNull(message = "检验结束时间不能为空")
    private Date endTime;


    //试验项目(委托专属)
    @JsonSerialize
    private String experiment;

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java

@@ -85,5 +85,6 @@
     * @return
     */
    boolean chooseEquipment(Integer id, Integer equipmentId);

}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java

@@ -197,7 +197,10 @@
            return inspection.getId();
        }
        //如果试验项目为空则按照型号id在标准库里面全部匹配
        List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationId));
        List<Product> productList =
                productMapper.selectList(Wrappers.<Product>query()
                        .eq("specifications_id", specificationId)
                .eq("version",inspectionVo.getVersion()));
        //将查询的项目信息构建成检验项目
        ArrayList<InspectionProduct> list = new ArrayList<>();
        for (Product product : productList) {