From 6d7857d3d4fc245418332eb80f357d896ac87632 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 12:52:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2025-11-12=20=E6=96=99=E5=8F=B7=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6Project=20Part=E6=9F=A5=E8=AF=A2=E5=8A=A0site?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/part/PartInformationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index 96026e6f..ff232880 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/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 - 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 #{item} From 2a5d620d981db9066512c3306075d26b0968c238 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 13:20:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2025-11-12=20=E8=AF=A2=E4=BB=B7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/modules/quotation/vo/QuotationInformationVo.java | 2 ++ .../resources/mapper/quotation/QuotationInformationMapper.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java index 3d0028d4..cf459f93 100644 --- a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java +++ b/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; } diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index 90995bce..e705a137 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -204,6 +204,9 @@ AND dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) like #{query.approvalUsername} + + and a.create_by like #{query.createBy2} + order by a.quotation_batch_no desc, a.quotation_item_no From 3374dbd3e9801eebe1973c049bee48d18c8abb6e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 14:40:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2025-11-12=20=E6=B5=8B=E8=AF=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=9D=90=E6=96=99=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/modules/test/entity/TestInformationEntity.java | 5 +++++ src/main/resources/mapper/test/TestInformationMapper.xml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java b/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java index a48782dc..55ec416c 100644 --- a/src/main/java/com/spring/modules/test/entity/TestInformationEntity.java +++ b/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; } diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml index 170ea770..99916177 100644 --- a/src/main/resources/mapper/test/TestInformationMapper.xml +++ b/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,