修改2.0 9.15

zss

2023-09-15 22899f74279a47f4ec79e1325f8489d948ced005

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

@@ -42,16 +42,7 @@
    MbomMapper mbomMapper;

    @Resource
    MbomService mbomService;

    @Resource
    TechniqueMapper techniqueMapper;

    @Resource
    ProductService productService;

    @Resource
    TechniqueService techniqueService;


    //根据型号id查询版本
@@ -74,18 +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
    @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() +"】成功";
    }

    //填写生产定额,鼠标移开保存
@@ -127,4 +126,13 @@
        //批量删除生产工艺表
        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);
    }
}