修改 9.21

zss

2023-09-21 2dbc49184bd74845c8da694c20d6fd03d7ac87e0

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.*;
@@ -11,12 +11,10 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;


/**
 * <p>
@@ -41,19 +39,6 @@
    @Resource
    MbomMapper mbomMapper;

    @Resource
    MbomService mbomService;

    @Resource
    TechniqueMapper techniqueMapper;

    @Resource
    ProductService productService;

    @Resource
    TechniqueService techniqueService;


    //根据型号id查询版本
    @Override
    public List<Integer> selectVerByTec(Integer specificationsId) {
@@ -66,7 +51,7 @@
        return technologyMapper.selectAllTec(specificationsId, version, message);
    }

    //右上角新增-->工艺路线-->选择设备组
    //右上角新增-->工艺路线-->选择生产设备组
    @Override
    public List<Map<String, Object>> chooseDevice() {
        return deviceMapper.chooseDevGroup();
@@ -74,18 +59,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
    @Transactional(rollbackFor = Exception.class)
    public void addTechnology(Integer specificationsId, 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);
        technology.setSpecificationsId(specificationsId);
        technologyMapper.insert(technology);
        return "添加工艺【"+ technologyDto.getName() +"】成功";
    }

    //填写生产定额,鼠标移开保存
@@ -110,8 +103,6 @@
        productMapper.delProByTecId(id);
        //删除物料清单表
        mbomMapper.delMbomByTecId(id);
        //删除生产工艺表
        techniqueMapper.delTeqByTecId(id);
    }

    //批量删除
@@ -124,7 +115,14 @@
        productMapper.delAllByTechId(ids);
        //批量删除物料清单表
        mbomMapper.delAllByTecId(ids);
        //批量删除生产工艺表
        techniqueMapper.delAllByTecId(ids);
    }

    //选择设备组,鼠标移开保存
    @Override
    public Integer writeDevice(Integer id, String deviceGroup) {
        Technology technology = new Technology();
        technology.setId(id);
        technology.setDeviceGroup(deviceGroup);
        return technologyMapper.updateById(technology);
    }
}