修改包路径

zss

2025-03-04 021468486e1179c00670caa13349a844cc0abc0e

 basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java

ÎļþÃû´Ó basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.basic.service.impl;
package com.ruoyi.inspect.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -8,19 +8,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListService2;
import com.ruoyi.inspect.dto.CopyStandardProductListDto;
import com.ruoyi.inspect.dto.InsSampleReceiveDto;
import com.ruoyi.inspect.dto.ProductDto;
import com.ruoyi.inspect.dto.ResetTreeDragDTO;
import com.ruoyi.inspect.mapper.StandardProductListMapper;
import com.ruoyi.inspect.mapper.StandardProductListSupplierAskMapper;
import com.ruoyi.inspect.mapper.StandardTreeMapper;
import com.ruoyi.inspect.pojo.StandardProductList;
import com.ruoyi.inspect.pojo.StandardTree;
import com.ruoyi.inspect.service.StandardProductListService;
import com.ruoyi.inspect.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -46,8 +44,6 @@
    private StandardTreeMapper standardTreeMapper;

    private StandardProductListService2 standardProductListService2;

    private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;

    private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;

@@ -166,31 +162,7 @@
                })
                .collect(Collectors.toList());

        // æŸ¥è¯¢åŽ‚家是否有特殊要求值
        if (insSample.getIfsInventoryId() != null) {
            // æŸ¥è¯¢åŽŸææ–™åŽ‚家名称
            String supplierName = ifsInventoryQuantityMapper.selectById(insSample.getIfsInventoryId())
                    .getSupplierName();
            List<Long> collect = list.stream().map(StandardProductList::getId).collect(Collectors.toList());
            if (CollectionUtils.isNotEmpty(collect)) {
                List<StandardProductListSupplierAsk> supplierAsks = standardProductListSupplierAskMapper.selectList(Wrappers.<StandardProductListSupplierAsk>lambdaQuery()
                        .in(StandardProductListSupplierAsk::getProductListId, collect)
                        .eq(StandardProductListSupplierAsk::getSupplierName, supplierName));

                // åˆ¤æ–­æœ‰æ²¡æœ‰ç‰¹æ®Šå€¼ç»‘定
                if (CollectionUtils.isNotEmpty(supplierAsks)) {
                    for (StandardProductList standardProductList : list) {
                        for (StandardProductListSupplierAsk supplierAsk : supplierAsks) {
                            if (standardProductList.getId().equals(supplierAsk.getProductListId())) {
                                // é‡æ–°èµ‹å€¼è¦æ±‚值和要求描述
                                standardProductList.setAsk(supplierAsk.getAsk());
                                standardProductList.setTell(supplierAsk.getTell());
                            }
                        }
                    }
                }
            }
        }

        return list;
    }