From 0635bd2dc029c8c4092d5387ee26e2cfd5c601da Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 9 Aug 2024 11:27:54 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E4=BC=B0=E4=BB=B7=E8=AF=A6=E6=83=85=E5=AD=90=E8=A1=A8Id?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=B7=E8=AF=A6=E6=83=85=E7=89=A9=E6=96=99=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=88=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=89=A9=E6=96=99=E8=A1=A8=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=96=B0=E5=A2=9E=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sales/mapper/SalesEstimateDetailMaterialMapper.java  | 8 ++++++++
 .../sales/service/impl/SalesEstimateServiceImpl.java     | 5 ++++-
 .../mapper/sales/SalesEstimateDetailMaterialMapper.xml   | 9 +++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateDetailMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateDetailMaterialMapper.java
index 8ed816e4..b6b29fe4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateDetailMaterialMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/mapper/SalesEstimateDetailMaterialMapper.java
@@ -100,4 +100,12 @@ public interface SalesEstimateDetailMaterialMapper
      */
     List<SalesEstimateDetailMaterial> selectAllDetailMaterialList();
 
+
+    /**
+     * 通过销售估价详情Id批量查询所有详情物料
+     *
+     * @return 结果
+     */
+    List<SalesEstimateDetailMaterial> selectDetailMaterialListByEstimateDetailIds(List<Long> estimateDetailIds);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
index aca5a815..b32ee762 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.BusinessException;
@@ -258,8 +259,10 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
         if (hasTaxPurchaseRmb){
             throw new BusinessException("存在含税采购单价为空，请检查");
         }
+         //获取物料详情Id集合
+        List<Long> collectEstimateDetailId = salesEstimateDetailList.stream().map(SalesEstimateDetail::getEstimateDetailId).collect(Collectors.toList());
 
-        List<SalesEstimateDetailMaterial> tempDetailMaterialList = estimateDetailMaterialMapper.selectAllDetailMaterialList();
+        List<SalesEstimateDetailMaterial> tempDetailMaterialList = estimateDetailMaterialMapper.selectDetailMaterialListByEstimateDetailIds(collectEstimateDetailId);
         if (estimateDetailMaterialList.size()<tempDetailMaterialList.size()){
             throw new BusinessException("请展开所有物料数据并填写采购价格");
         }
diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMaterialMapper.xml
index b93a2df8..ef74e155 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMaterialMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMaterialMapper.xml
@@ -45,10 +45,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSalesEstimateDetailMaterialVo"/>
         where estimate_detail_id = #{estimateDetailId}
     </select>
+
     <select id="selectAllDetailMaterialList" resultMap="SalesEstimateDetailMaterialResult">
         <include refid="selectSalesEstimateDetailMaterialVo"/>
     </select>
 
+    <select id="selectDetailMaterialListByEstimateDetailIds" parameterType="java.util.List" resultMap="SalesEstimateDetailMaterialResult">
+        <include refid="selectSalesEstimateDetailMaterialVo"/>
+        WHERE estimate_detail_id IN
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
     <insert id="insertSalesEstimateDetailMaterial" parameterType="SalesEstimateDetailMaterial" useGeneratedKeys="true" keyProperty="estimateDetailMaterialId">
         insert into sales_estimate_detail_material
         <trim prefix="(" suffix=")" suffixOverrides=",">