Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-30 425e388128ba159fb9ff714d6bde24caa25e85ef

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsMaterials;
@@ -21,6 +22,7 @@
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.micrometer.core.instrument.binder.BaseUnits;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -85,8 +87,8 @@
    public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
        Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
        LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&slGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
            wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&& !slGoodsMaterialsQuery.getGoodsMaterialsName().isEmpty()){
            wrapper.like(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        }
        if (slGoodsMaterialsQuery.getIsConsume()!=0){
            wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
@@ -107,7 +109,7 @@
                .collect(Collectors.toSet());

        LambdaQueryWrapper< SlGoodsMaterials> wrapper1 =Wrappers.lambdaQuery();
        if (storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
        if (storeManagementGoodSmaterialsQuery.getIsConsume()!=null&&storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
            wrapper1.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
        }
        if (storeManagementGoodSmaterialsQuery.getGoodsMaterialsName()!=null){
@@ -123,10 +125,10 @@
        Page<ManagementGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
        LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();

        if (slVolumeProductionIdList.size()>0){
        if (!slVolumeProductionIdList.isEmpty()){
            wrapper.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
        }
        if (SlGoodsMaterialsList.size()>0){
        if (!SlGoodsMaterialsList.isEmpty()){
            wrapper.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
        }
        wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
@@ -145,4 +147,25 @@

        return storeManagementGoodSmaterialsVOPageDTO;
    }

    @Override
    public StoreManagementGoodSmaterialsVO getSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
        LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();


        wrapper.eq(ManagementGoodsMaterials::getGoodsMaterialsId,storeManagementGoodSmaterialsQuery.getGoodsMaterialsId());

        wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
        wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
        ManagementGoodsMaterials page1 = managementGoodsMaterialsService.getOne(wrapper);
        StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO = BeanUtils.copyBean(page1, StoreManagementGoodSmaterialsVO.class);
            Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
            SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
        storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
        storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());
        storeManagementGoodSmaterialsVO.setAveragePrice(storeManagementGoodSmaterialsOne);
           return storeManagementGoodSmaterialsVO;
        }


}