修改2.0 9.15

zss

2023-09-15 22899f74279a47f4ec79e1325f8489d948ced005

修改2.0   9.15

 base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java

@@ -56,8 +56,7 @@
    @ApiOperation(value = "新增工艺路线维护")
    @PostMapping("/addTechTemp")
    public Result addTechTemp(@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
        technologyTemplateService.addTechTemp(technologyTemplateDto);
        return Result.success("新增成功!");
        return Result.success(technologyTemplateService.addTechTemp(technologyTemplateDto));
    }

    @ApiOperation(value = "查询工艺路线列表-->左边二级展示")

 base-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java

@@ -33,7 +33,7 @@
     * 新增工艺路线
     * @param technologyTemplateDto
     */
    void addTechTemp(TechnologyTemplateDto technologyTemplateDto);
    String addTechTemp(TechnologyTemplateDto technologyTemplateDto);

    /**
     * 查询工艺路线列表-->左边二级展示

 base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java

@@ -1,5 +1,7 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.TechnologyTemplate;
@@ -60,11 +62,20 @@
    //新增工艺路线
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
    public String addTechTemp(TechnologyTemplateDto technologyTemplateDto) {
        /*校验是否添加重复*/
        if (ObjectUtils.isNotEmpty(technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query()
                .eq("type", technologyTemplateDto.getType())
                .eq("state", 1)
                .eq("father", technologyTemplateDto.getFather())
                .eq("name", technologyTemplateDto.getName())))) {
            return "重复添加!";
        }
        /*新增工艺*/
        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
        BeanUtils.copyProperties(technologyTemplateDto, technologyTemplate);
        technologyTemplateMapper.insert(technologyTemplate);
        return "添加成功!";
    }

    //查询工艺路线列表-->左边一级展示

 inspect-server/src/main/java/com/yuanchu/mom/pojo/FinishedInspect.java

@@ -85,6 +85,11 @@
    private Integer userId;

    /**
     * 关联 最后一道工艺id
     **/
    private Integer techId;

    /**
     * 检验结论;0:不合格;1:合格
     **/
    private Integer result;

 inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessInspect.java

@@ -75,6 +75,11 @@
    private String techname;

    /**
     * 关联 工艺id
     **/
    private Integer techId;

    /**
     * 报检人:用户id
     **/
    private Integer userId;

 inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/ProcessInspectVo.java

@@ -30,10 +30,11 @@
    @NotBlank(message = "工艺不能为空!")
    private String techname;

    @NotNull(message = "工艺路线id不能为空!")
    private Integer techId;

    @NotNull(message = "数量不能为空!")
    private Integer quantity;

    @NotNull(message = "关联的工艺路线id不能为空!")
    private Integer technologyId;

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java

@@ -64,6 +64,10 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Integer addProcessInspectionSheet(String userId, FinishedInspectVo finishedInspectVo) {
        //根据生产订单id查询编制工序的最后一道工艺
        List<ManualTechnology> manualTechnologyList = manualTechnologyMapper.selAllByMoId(finishedInspectVo.getId());
        //获取最后一道工艺关联的工艺路线id
        Integer technologyId = manualTechnologyList.get(0).getTechnologyId();
        /*新增成品检验单*/
        FinishedInspect finishedInspect = new FinishedInspect();
        finishedInspect.setUserId(Integer.parseInt(userId));
@@ -76,14 +80,10 @@
        finishedInspect.setSpecificationsModel(finishedInspectVo.getSpecificationsModel());
        finishedInspect.setMaterial(finishedInspectVo.getMaterial());
        finishedInspect.setMaterialCode(finishedInspectVo.getMcode());
        finishedInspect.setTechId(technologyId);
        finishedInspectMapper.insert(finishedInspect);
        /*批量新增成品检验项目单*/
        //获取型号id
        //Integer specificationId = getSpecificationId(finishedInspectVo.getMaterial(), finishedInspectVo.getMcode(), finishedInspectVo.getSpecificationsModel());
        //根据生产订单id查询编制工序的最后一道工艺
        List<ManualTechnology> manualTechnologyList = manualTechnologyMapper.selAllByMoId(finishedInspectVo.getId());
        //获取最后一道工艺关联的工艺路线id
        Integer technologyId = manualTechnologyList.get(0).getTechnologyId();

        /*//查询标准BOM技术指标中该型号工艺下最新版本的检验项目
        Integer ver = productService.selectVerByPro(specificationId).get(0);//该型号下技术指标最新版本*/
        List<Product> productList = productService.selProByVerSpe(technologyId);
@@ -107,7 +107,7 @@
    public String updateFinishInspectsById(String username,Integer id) {
        /*更新检验单里面的检验结论*/
        //先判断检验结果
        List<Integer> results = inspectionItemMapper.getResult(id,1);
        List<Integer> results = inspectionItemMapper.getResult(id,2);
        int count = 0;
        for (Integer result : results) {
            if (result != null && result == 1) {

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java

@@ -63,7 +63,7 @@
        Integer specificationId = getSpecificationId(processInspectVo.getMaterial(), processInspectVo.getMaterialCode(), processInspectVo.getSpecificationsModel());
        //查询标准BOM技术指标中该型号工艺下最新版本的检验项目
        Integer ver = productService.selectVerByPro(specificationId).get(0);//该型号下技术指标最新版本*/
        List<Product> productList = productService.selProByVerSpe(processInspectVo.getTechnologyId());
        List<Product> productList = productService.selProByVerSpe(processInspectVo.getTechId());
        List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
            InspectionItem inspectionItem = new InspectionItem();
            BeanUtils.copyProperties(product, inspectionItem);

 inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml

@@ -62,6 +62,7 @@
        <id property="name" column="order_number"/>
        <result property="customerName" column="customer_name"/>
        <result property="projectName" column="project_name"/>
        <result property="techId" column="tech_id"/>
        <result property="qualityTraceability" column="quality_traceability"/>
        <result property="materialCode" column="material_code"/>
        <result property="material" column="material"/>
@@ -90,6 +91,7 @@
        select order_number,
               customer_name,
               project_name,
               tech_id,
               quality_traceability,
               material_code,
               material,

 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml

@@ -28,7 +28,7 @@
        WHERE p.`state` = 1
        UNION ALL
        SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
        dateArrival,material_code,project_name,specifications_model,
        dateArrival,material_code, material project_name,specifications_model,
        unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
        processingDate, fi.`user_id`, 1 AS classify
        FROM mom_ocean.finished_inspect fi

 inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml

@@ -41,6 +41,7 @@
        <result property="specifications" column="specifications_model"/>
        <result property="techfather" column="techfather"/>
        <result property="techname" column="techname"/>
        <result property="techId" column="tech_id"/>
        <result property="punit" column="punit"/>
        <result property="quantity" column="quantity"/>
        <result property="presult" column="presult"/>
@@ -68,6 +69,7 @@
               specifications_model,
               techfather,
               techname,
               tech_id,
               pi.unit     punit,
               quantity,
               ii.id       iid,
@@ -92,26 +94,26 @@
    <!--分页查询过程检验单列表-->
    <select id="selectProcessInspectsList" resultType="java.util.Map">
        select process_inspect.id,
               order_number,
               material_code,
               material,
               specifications_model,
               techfather,
               techname,
               unit,
               quantity,
               DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
               name,
               DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
               result
        order_number,
        material_code,
        material,
        specifications_model,
        techfather,
        techname,
        unit,
        quantity,
        DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
        name,
        DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
        result
        from mom_ocean.process_inspect
                 left join mom_ocean.user on process_inspect.user_id = user.id
        left join mom_ocean.user on process_inspect.user_id = user.id
        where process_inspect.state = 1
        <if test="techfather!=null and techfather!=''">
            and techfather like  concat('%',#{techfather},'%')
            and techfather like concat('%',#{techfather},'%')
        </if>
        <if test="name!=null and name!=''">
            and material like  concat('%',#{name},'%')
            and material like concat('%',#{name},'%')
        </if>
        <if test="result!=null ">
            and result =#{result}

 standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java

@@ -30,11 +30,12 @@

    @ApiOperation("右上角新增-->物料清单-->选择工序,工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "version", value = "当前版本", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseTech")
    public Result<?> chooseTech(Integer specificationsId) {
        return Result.success(mbomService.chooseTech(specificationsId));
    public Result<?> chooseTech(Integer specificationsId,Integer version) {
        return Result.success(mbomService.chooseTech(specificationsId,version));
    }



 standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java

@@ -23,11 +23,12 @@

    @ApiOperation("右上角新增-->技术指标-->选择工序,工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "version", value = "当前版本", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseTech")
    public Result<?> chooseTech(Integer specificationsId) {
        return Result.success(productService.chooseTech(specificationsId));
    public Result<?> chooseTech(Integer specificationsId,Integer version) {
        return Result.success(productService.chooseTech(specificationsId,version));
    }

    @ApiOperation("右上角新增-->技术指标-->选择项目父类")
@@ -49,9 +50,8 @@
    @ApiOperation("填写标准值与内控值,鼠标移开保存")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "required", value = "标准值", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "internal", value = "内控值", dataTypeClass = String.class, required = true)

            @ApiImplicitParam(name = "required", value = "标准值", dataTypeClass = String.class),
            @ApiImplicitParam(name = "internal", value = "内控值", dataTypeClass = String.class)
    })
    @PostMapping("/write")
    public Result<?> write(Integer id, String required, String internal) {

 standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java

@@ -30,11 +30,12 @@

    @ApiOperation("右上角新增-->生产工艺-->选择工序,工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "version", value = "当前版本", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseTech")
    public Result<?> chooseTech(Integer specificationsId) {
        return Result.success(techniqueService.chooseTech(specificationsId));
    public Result<?> chooseTech(Integer specificationsId,Integer version) {
        return Result.success(techniqueService.chooseTech(specificationsId,version));
    }

    @ApiOperation("右上角新增-->生产工艺-->选择设备")

 standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java

@@ -37,18 +37,18 @@

    @ApiOperation("右上角新增-->工艺路线-->选择工序")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "version", value = "版本", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseFather")
    public Result<?> chooseFather(Integer specificationsId) {
        return Result.success(technologyService.chooseFather(specificationsId));
    public Result<?> chooseFather(Integer specificationsId,Integer version) {
        return Result.success(technologyService.chooseFather(specificationsId,version));
    }

    @ApiOperation("右上角新增-->工艺路线")
    @PostMapping("/add")
    public Result<?> addTechnology(@Validated @RequestBody TechnologyDto technologyDto) {
        technologyService.addTechnology(technologyDto);
        return Result.success("添加工艺【" + technologyDto.getName() + "】成功");
        return Result.success(technologyService.addTechnology(technologyDto));
    }

    @ApiOperation("填写生产定额,鼠标移开保存")

 standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyMapper.java

@@ -23,10 +23,10 @@
    List<Map<String, Object>> selectAllTec(Integer specificationsId, Integer version,String message);

    //右上角新增-->工艺路线-->选择工序
    List<Map<String, Object>> chooseFather(Integer specificationsId);
    List<Map<String, Object>> chooseFather(Integer specificationsId,Integer version);

    //右上角新增-->技术指标-->选择工序,工艺
    List<Map<String, Object>> chooseTech(Integer specificationsId);
    //右上角新增-->技术指标 物料清单 生产工艺-->选择工序,工艺
    List<Map<String, Object>> chooseTech(Integer specificationsId,Integer version);

    //批量删除
    void delAllTech(String ids);

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MbomDto.java

@@ -16,4 +16,7 @@
    //原材料清单集合
    private List<MbomDto2> mbomDto2List;

    @NotNull(message = "当前版本不能为空!")
    private Integer version;

}

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/ProductDto.java

@@ -40,4 +40,7 @@
     * 内控值
     */
    private String internal;

    @NotNull(message = "当前版本不能为空!")
    private Integer version;
}

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechniqueDto.java

@@ -35,4 +35,7 @@
     **/
    @NotBlank(message = "指标(子类项目)不能为空!")
    private String product;

    @NotNull(message = "当前版本不能为空!")
    private Integer version;
}

 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyDto.java

@@ -28,4 +28,7 @@

    //生产定额(个/天)
    private Integer productionQuota;

    @NotNull(message = "当前版本不能为空!")
    private Integer version;
}

 standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java

@@ -35,7 +35,7 @@
     * @param specificationsId
     * @return
     */
    List<Map<String,Object>> chooseTech(Integer specificationsId);
    List<Map<String,Object>> chooseTech(Integer specificationsId,Integer version);

    /**
     * 右上角新增-->物料清单

 standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java

@@ -41,7 +41,7 @@
     * @param specificationsId
     * @return
     */
    List<Map<String,Object>> chooseTech(Integer specificationsId);
    List<Map<String,Object>> chooseTech(Integer specificationsId,Integer version);

    /**
     * 右上角新增-->技术指标-->选择项目父类

 standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java

@@ -35,7 +35,7 @@
     * @param specificationsId
     * @return
     */
    List<Map<String,Object>> chooseTech(Integer specificationsId);
    List<Map<String,Object>> chooseTech(Integer specificationsId,Integer version);

    /**
     * 右上角新增-->生产工艺-->选择设备

 standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java

@@ -41,13 +41,13 @@
     * 右上角新增-->工艺路线-->选择工序
     * @return
     */
    List<Map<String,Object>> chooseFather(Integer specificationsId);
    List<Map<String,Object>> chooseFather(Integer specificationsId,Integer version);

    /**
     * 右上角新增-->工艺路线
     * @param technologyDto
     */
    void addTechnology(TechnologyDto technologyDto);
    String addTechnology(TechnologyDto technologyDto);

    /**
     * 填写生产定额,鼠标移开保存

 standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java

@@ -44,8 +44,8 @@

    //右上角新增-->物料清单-->选择工序,工艺
    @Override
    public List<Map<String, Object>> chooseTech(Integer specificationsId) {
        return technologyMapper.chooseTech(specificationsId);
    public List<Map<String, Object>> chooseTech(Integer specificationsId,Integer version) {
        return technologyMapper.chooseTech(specificationsId,version);
    }

    //右上角新增-->物料清单
@@ -55,6 +55,7 @@
        List<Mbom> mbomList = mbomDto2List.stream().map(mbomDto2 -> {
            Mbom mbom = new Mbom();
            mbom.setTechnologyId(mbomDto.getTechnologyId());
            mbom.setVersion(mbomDto.getVersion());
            BeanUtils.copyProperties(mbomDto2, mbom);
            return mbom;
        }).collect(Collectors.toList());

 standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java

@@ -53,8 +53,8 @@

    //右上角新增-->技术指标-->选择工序,工艺
    @Override
    public List<Map<String, Object>> chooseTech(Integer specificationsId) {
        return technologyMapper.chooseTech(specificationsId);
    public List<Map<String, Object>> chooseTech(Integer specificationsId, Integer version) {
        return technologyMapper.chooseTech(specificationsId, version);
    }

    //右上角新增-->技术指标-->选择项目父类
@@ -69,13 +69,13 @@
        Product product = new Product();
        String required = productDto.getRequired();
        String internal = productDto.getInternal();
        if (ObjectUtils.isNotEmpty(required)){
        if (ObjectUtils.isNotEmpty(required)) {
            char requ = required.charAt(0);
            if (requ != '>' && requ != '<' && requ != '=') {
                return "标准值输入格式有问题!";
            }
        }
        if (ObjectUtils.isNotEmpty(internal)){
        if (ObjectUtils.isNotEmpty(internal)) {
            char inter = internal.charAt(0);
            if (inter != '>' && inter != '<' && inter != '=') {
                return "内控值输入格式有问题!";
@@ -90,14 +90,18 @@
    @Override
    public String write(Integer id, String required, String internal) {
        //校验标准值,内控值格式
        if (ObjectUtils.isNotEmpty(internal)) {
            char inter = internal.charAt(0);
            char requ = required.charAt(0);
            if (inter != '>' && inter != '<' && inter != '=') {
                return "内控值输入格式有问题!";
            }
        }
        if (ObjectUtils.isNotEmpty(required)) {
            char requ = required.charAt(0);
            if (requ != '>' && requ != '<' && requ != '=') {
                return "标准值输入格式有问题!";
            }
        }
        Product product = new Product();
        product.setId(id);
        product.setRequired(required);

 standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java

@@ -81,7 +81,17 @@
        /*新增标准BOM-->工艺路线(批量添加)*/
        //根据标准id查询物料大类
        Material material = materialMapper.selFath(specificationsDto.getId());
        List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", material.getFather()));
        Integer type = null;
        if (material.getFather().equals("橡胶连接器")){
            type=0;
        }else if (material.getFather().equals("金属连接器")){
            type=1;
        }else if(material.getFather().equals("湿插拔电连接器")){
            type=2;
        }else if(material.getFather().equals("分支组件")){
            type=3;
        }else return "添加型号【" + specificationsDto.getSpecifications() + "】成功";
        List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type",type));
        List<Technology> technologyList = technologyTemplateList.stream().map(technologyTemplate -> {
            Technology technology = new Technology();
            technology.setSpecificationsId(specifications.getId());

 standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java

@@ -83,7 +83,17 @@
        /*新增标准BOM-->工艺路线(批量添加)*/
        //查询物料的大类(根据物料id)
        Material material = materialMapper.selectById(standardDto.getId());
        List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", material.getFather()));
        Integer type = null;
        if (material.getFather().equals("橡胶连接器")){
            type=0;
        }else if (material.getFather().equals("金属连接器")){
            type=1;
        }else if(material.getFather().equals("湿插拔电连接器")){
            type=2;
        }else if(material.getFather().equals("分支组件")){
            type=3;
        }else return "添加标准【" + standardDto.getStandard() + "】成功";
        List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", type));
        List<Technology> technologyList = technologyTemplateList.stream().map(technologyTemplate -> {
            Technology technology = new Technology();
            technology.setSpecificationsId(specifications.getId());

 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java

@@ -42,8 +42,8 @@

    //右上角新增-->生产工艺-->选择工序,工艺
    @Override
    public List<Map<String, Object>> chooseTech(Integer specificationsId) {
        return technologyMapper.chooseTech(specificationsId);
    public List<Map<String, Object>> chooseTech(Integer specificationsId,Integer version) {
        return technologyMapper.chooseTech(specificationsId,version);
    }

    //右上角新增-->生产工艺-->选择设备

 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java

@@ -65,16 +65,26 @@

    //右上角新增-->工艺路线-->选择工序
    @Override
    public List<Map<String, Object>> chooseFather(Integer specificationsId) {
        return technologyMapper.chooseFather(specificationsId);
    public List<Map<String, Object>> chooseFather(Integer specificationsId,Integer version) {
        return technologyMapper.chooseFather(specificationsId,version);
    }

    //右上角新增-->工艺路线
    @Override
    public void addTechnology(TechnologyDto technologyDto) {
    public String addTechnology(TechnologyDto technologyDto) {
        /*校验是否添加重复*/
        if (ObjectUtils.isNotEmpty(technologyMapper.selectList(Wrappers.<Technology>query()
                .eq("version", technologyDto.getVersion())
                .eq("state", 1)
                .eq("specifications_id",technologyDto.getSpecificationsId())
                .eq("father", technologyDto.getFather())
                .eq("name", technologyDto.getName())))) {
            return "重复添加!";
        }
        Technology technology = new Technology();
        BeanUtils.copyProperties(technologyDto, technology);
        technologyMapper.insert(technology);
        return "添加工艺【"+ technologyDto.getName() +"】成功";
    }

    //填写生产定额,鼠标移开保存

 standard-server/src/main/resources/mapper/MbomMapper.xml

@@ -43,7 +43,7 @@
        and m.version = #{version}
        and specifications_id = #{specificationsId}
        <if test="message!=null and message!=''">
            and m.name like concat('%',#{message},'%')
            and t.name like concat('%',#{message},'%')
        </if>
    </select>


 standard-server/src/main/resources/mapper/ProductMapper.xml

@@ -65,7 +65,7 @@
        and p.version = #{version}
        and specifications_id = #{specificationsId}
        <if test="message!=null and message!=''">
            and p.name like concat('%',#{message},'%')
            and p.father like concat('%',#{message},'%')
        </if>
    </select>


 standard-server/src/main/resources/mapper/TechniqueMapper.xml

@@ -65,7 +65,7 @@
        and specifications_id = #{specificationsId}
        and tq.version = #{version}
        <if test="message!=null and message!=''">
            and device like concat('%',#{message},'%')
            and name like concat('%',#{message},'%')
        </if>
    </select>

@@ -124,6 +124,7 @@
        from mom_ocean.technique
                 left join mom_ocean.device on name = device
        where technique.state = 1
          and device.state = 1
          and technology_id = #{technologyId}
          and product_father = #{father}
          and product = #{name}

 standard-server/src/main/resources/mapper/TechnologyMapper.xml

@@ -32,7 +32,7 @@
        and specifications_id = #{specificationsId}
        and version = #{version}
        <if test="message!=null and message!=''">
            and father like concat('%',#{message},'%')
            and name like concat('%',#{message},'%')
        </if>
    </select>

@@ -42,6 +42,7 @@
        from mom_ocean.technology
        where state = 1
          and specifications_id = #{specificationsId}
          and version = #{version}
    </select>

    <!--右上角新增-技术指标-选择工序,工艺-->
@@ -60,6 +61,7 @@
        from mom_ocean.technology
        where state = 1
          and specifications_id = #{specificationsId}
          and version = #{version}
    </select>
    <!--查询该型号工艺下最新版本的工艺id-->
    <select id="selTech" resultType="java.lang.Integer">