From 021468486e1179c00670caa13349a844cc0abc0e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 17:25:15 +0800
Subject: [PATCH] 修改包路径

---
 basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java |   52 ++++++++++++----------------------------------------
 1 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
similarity index 93%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
index c5695ec..fac55a3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/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;
     }

--
Gitblit v1.9.3