代码提交 依赖整理 bug解决

无关风月

2024-07-30 4a0c56352223553481e1122665964546a39cddf5

代码提交 依赖整理 bug解决

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

@@ -123,10 +123,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);

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

@@ -20,6 +20,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.HashSet;
@@ -51,13 +52,12 @@
        SysUser data = sysUserClient.getSysUser(userid).getData();

        LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
        if(slGoodsShelfQuery.getStoreManagementName()!=null&& !slGoodsShelfQuery.getStoreManagementName().isEmpty()){
            wrapper.like(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
        }
        if (data.getRoleType()!=1){
        wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
        }
        wrapper.eq(SlStoreManagement::getDelFlag,0);
        List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
        Set<Long> slStoreManagementIdList = null;
@@ -67,7 +67,12 @@

        Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
        LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
        if (StringUtils.hasLength(slGoodsShelfQuery.getGoodsShelfName())){
        wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
            wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
        }
        if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
            if (slStoreManagementIdList.size() > 0) {
                wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
@@ -87,7 +92,6 @@
            SlStoreManagement byId = SlStoreManagementService.getById(list.getStoreManagementId());
            if (byId!=null){
                list.setStoreManagementName(byId.getStoreManagementName());
                list.setStoreManagementNumber(byId.getStoreManagementNumber());
                list.setProvinceName(byId.getProvinceName());
                list.setProvinceCode(byId.getProvinceCode());
                list.setCityName(byId.getCityName());

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

@@ -273,7 +273,6 @@
        goodsSkuIdList = page1.stream().map(SlGoodsMaterials::getId)
                .collect(Collectors.toSet());


        Page<SlVolumeProductionRk> page = new Page<>(gethuojRkQuery.getPageCurr(), gethuojRkQuery.getPageSize());
        LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
        if (gethuojRkQuery.getGoodsMaterialsName()!=null&&gethuojRkQuery.getGoodsMaterialsName()!=""){
@@ -285,6 +284,7 @@
            wrapper1.in(SlVolumeProductionRk::getMaterialsId, goodsSkuIdList);
          }
        }
        wrapper1.eq(SlVolumeProductionRk::getShelfId,gethuojRkQuery.getGoodsShelid());
        wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
        Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
@@ -298,8 +298,11 @@
            wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
            wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
            ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);

            if (managementGoodsMaterials != null){
            list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(managementGoodsMaterials.getRepertorySum())));
            }else{
                list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(1)));
            }
            list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
            SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());