问题处理

hx-item/src/main/resources/mapper/product/ProductBomDetailMapper.xml

@@ -4,7 +4,8 @@
     <select id="getList" resultType="com.fjhx.item.entity.product.vo.ProductBomDetailVo">
         SELECT pbd.*,
                pp.`name` AS processesName,
-               pp.`name` AS materialName
+               pp.`name` AS materialName,
+               pp.`code` AS materialCode
         FROM product_bom_detail pbd
                  LEFT JOIN production_processes pp ON pbd.processes_id = pp.id or pbd.material_id = pp.id
             ${ew.customSqlSegment}

hx-sale/src/main/java/com/fjhx/sale/service/quotation/impl/QuotationEstimateServiceImpl.java

@@ -110,14 +110,14 @@ public class QuotationEstimateServiceImpl extends ServiceImpl<QuotationEstimateM
                 }
 
                 //赋值工序信息
-                if (ObjectUtil.notEqual(quotationProductBom.getType(), 3)) {
+                if (ObjectUtil.equals(quotationProductBom.getType(), 3)) {
                     ProcessesBo processesBo = collect.getOrDefault(quotationProductBom.getProcessesId(), collect.get(quotationProductBom.getMaterialId()));
                     if (ObjectUtil.isNotEmpty(processesBo)) {
                         quotationEstimate.setCode(processesBo.getCode());
                         quotationEstimate.setName(processesBo.getName());
                     }
-                    quotationEstimateVos.add(quotationEstimate);
                 }
+                quotationEstimateVos.add(quotationEstimate);
             }
 
 //            //赋值工序信息

hx-sale/src/main/resources/mapper/ext/ExtQuotationProductBomMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.fjhx.sale.mapper.ext.ExtQuotationProductBomMapper">
     <select id="getList" resultType="com.fjhx.sale.entity.ext.vo.ExtQuotationProductBomVo">
         SELECT eqpb.*,
-               pp.`name` AS productName
+               pp.`name` AS productName,
+               pp.`code` AS productCode
         FROM ext_quotation_product_bom eqpb
                  LEFT JOIN production_processes pp ON eqpb.material_id = pp.id
             ${ew.customSqlSegment}

hx-sale/src/main/resources/mapper/quotation/QuotationProductBomMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.fjhx.sale.mapper.quotation.QuotationProductBomMapper">
     <select id="getList" resultType="com.fjhx.sale.entity.quotation.vo.QuotationProductBomVo">
         SELECT qpb.*,
-               pp.`name` AS productName
+               pp.`name` AS productName,
+               pp.`code` AS productCode
         FROM quotation_product_bom qpb
                  LEFT JOIN production_processes pp ON qpb.material_id = pp.id
             ${ew.customSqlSegment}