Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java

@@ -97,4 +97,6 @@ public class QuotationInformationVo extends QuotationInformationEntity {
     private String currency;
 
     private String plmPartNo;
+
+    private String createBy2;
 }

src/main/java/com/spring/modules/test/entity/TestInformationEntity.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -186,4 +187,8 @@ public class TestInformationEntity extends QueryPage implements Serializable {
     private Integer rejectStepId;
 
     private String soNumber;
+    /**
+     * 材料总金额
+     */
+    private BigDecimal materialTotalAmount;
 }

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -1380,7 +1380,7 @@
         and a.test_part_no = b.project_id and b.site = #{query.site} and b.project_id = #{query.projectId}
         left join part as c on a.site = c.site and a.test_part_no = c.part_no
 <!--        left join plm_customer_part_info as d on a.site = d.site and a.test_part_no = d.part_no and d.customer_no = #{query.customerId}-->
-        where b.site is null and c.show_in_query_flag = 'Y'
+        where a.site = #{query.site} and b.site is null and c.show_in_query_flag = 'Y'
         and c.part_no not in
         <foreach collection="query.arr" close=")" open="(" item="item" separator=",">
             #{item}

src/main/resources/mapper/quotation/QuotationInformationMapper.xml

@@ -204,6 +204,9 @@
             <if test="query.approvalUsername != null and query.approvalUsername != ''">
                 AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) like #{query.approvalUsername}
             </if>
+            <if test="query.createBy2 != null and query.createBy2 != ''">
+                and a.create_by like #{query.createBy2}
+            </if>
             order by a.quotation_batch_no desc, a.quotation_item_no
         </where>
     </select>

src/main/resources/mapper/test/TestInformationMapper.xml

@@ -56,6 +56,7 @@
                d.node_id,
                d.node_name,
                a.so_number,
+               a.material_total_amount,
                dbo.plm_get_user_display(a.site, d.create_by)                              as node_create_by,
                vpp.bu_no,
                b.bu_desc,
@@ -191,6 +192,7 @@
                pti.update_by,
                pti.print_type,
                pti.product_name,
+               pti.material_total_amount,
                pcpi.customer_part_no,
                vpp.final_part_no,
                d.node_name,
@@ -393,6 +395,7 @@
         d.node_id,
         d.node_name,
         a.so_number,
+        a.material_total_amount,
         dbo.plm_get_user_display(a.site, d.create_by)                              as node_create_by,
         vpp.bu_no,
         b.bu_desc,