代码提交 bug解决

无关风月

2024-09-03 56dfe0d4bf81262622a1919cceb2b039fd356209

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java

@@ -1,6 +1,8 @@
package com.ruoyi.management.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -58,8 +60,19 @@
            slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
            slGoodsMaterials.setGoodsMaterialsNo(slGoodsMaterialsDTO.getGoodsMaterialsNo());
            slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
            slGoodsMaterials.setCreateTime(new Date());
            this.save(slGoodsMaterials);
        }else{
            // 将该物资的所有预警库存修改
            List<ManagementGoodsMaterials> list = managementGoodsMaterialsService.list(new QueryWrapper<ManagementGoodsMaterials>()
                    .eq("del_flag", 0)
                    .eq("goods_materials_id", slGoodsMaterialsDTO.getId()));
            for (ManagementGoodsMaterials managementGoodsMaterials : list) {
                managementGoodsMaterialsService.update(new UpdateWrapper<ManagementGoodsMaterials>()
                        .set("repertory", slGoodsMaterialsDTO.getRepertory())
                        .eq("id",managementGoodsMaterials.getId()));
            }

            SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
            if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){
                byId.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
@@ -101,7 +114,7 @@
        if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&& !slGoodsMaterialsQuery.getGoodsMaterialsName().isEmpty()){
            wrapper.like(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        }
        if (slGoodsMaterialsQuery.getIsConsume()!=0){
        if (slGoodsMaterialsQuery.getIsConsume() !=null && slGoodsMaterialsQuery.getIsConsume()!=0){
            wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
        }
        wrapper.eq( SlGoodsMaterials::getDelFlag,0);
@@ -114,6 +127,7 @@
    public PageDTO<StoreManagementGoodSmaterialsVO> getStoreManagementGoodSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
        LambdaQueryWrapper<SlVolumeProductionRk> wrappers= Wrappers.lambdaQuery();
        wrappers.eq(SlVolumeProductionRk::getManagementId,storeManagementGoodSmaterialsQuery.getStoreManagementId());
        wrappers.isNotNull(SlVolumeProductionRk::getNewAddTime);
        List<SlVolumeProductionRk> slVolumeProductionRks = slVolumeProductionRkMapper.selectList(wrappers);
        Set<Long> slVolumeProductionIdList = null;
        slVolumeProductionIdList = slVolumeProductionRks.stream().map(SlVolumeProductionRk::getMaterialsId)
@@ -149,7 +163,7 @@
        PageDTO<StoreManagementGoodSmaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, StoreManagementGoodSmaterialsVO.class);
        List<StoreManagementGoodSmaterialsVO> list = storeManagementGoodSmaterialsVOPageDTO.getList();
        for (StoreManagementGoodSmaterialsVO li:list){
            Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getGoodsMaterialsId());
            Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getGoodsMaterialsId(),li.getManagementId());
            SlGoodsMaterials byId = this.getById(li.getGoodsMaterialsId());
            li.setGoodsMaterialsName(byId.getGoodsMaterialsName());
            li.setIsConsume(byId.getIsConsume());
@@ -160,14 +174,15 @@

    @Override
    public StoreManagementGoodSmaterialsVO getSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
        LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        LambdaQueryWrapper<ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(ManagementGoodsMaterials::getGoodsMaterialsId,storeManagementGoodSmaterialsQuery.getGoodsMaterialsId());
        wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
        wrapper.eq( ManagementGoodsMaterials::getManagementId,storeManagementGoodSmaterialsQuery.getStoreManagementId());
        wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
        ManagementGoodsMaterials page1 = managementGoodsMaterialsService.getOne(wrapper);
        StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO = BeanUtils.copyBean(page1, StoreManagementGoodSmaterialsVO.class);
        Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
        Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId(),
                storeManagementGoodSmaterialsQuery.getStoreManagementId());
        SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
        storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
        storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());