Merge remote-tracking branch 'origin/dev' into dev

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);
+
 }

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("请展开所有物料数据并填写采购价格");
         }

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=",">