@@ -96,6 +96,13 @@
+
+
+
+
+
+
+
@@ -328,6 +335,8 @@ export default {
pageSize: 10,
projectCode: null,
projectName: null,
+ productCode: null,
+ productModel: null,
customerName: null,
bgProperty: null,
industryType: null,
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
index 4010473b..9e79eb96 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java
@@ -231,6 +231,8 @@ public class ProjectInfo extends BaseEntity
private List projectFileList;
private String fileId;
private String partnerSystemUserId;
+ private String productCode;
+ private String productModel;
private Integer quotationId;
private List quotationIdList;
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
index 759269d5..fbad3952 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryDeliveryMapper.xml
@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t1.delivery_time = #{deliveryTime}
and t1.delivery_type = #{deliveryType}
and t5.project_code = #{projectCode}
+ and t7.model like concat('%',#{model},'%')
+ and t7.product_code = #{productCode}
and t3.product_code in
#{item}
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
index a84de71d..5252b774 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml
@@ -148,6 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t1.partner_code = #{partnerCode}
and t1.partner_name = #{partnerName}
and t1.contact_way = #{contactWay}
+ and t1.id in (select project_id from project_product_info where product_bom_code = #{productCode})
+ and t1.id in (select project_id from project_product_info where model like concat('%', #{productModel},'%'))
and t1.estimated_amount = #{estimatedAmount}
and t1.currency_type = #{currencyType}
and t1.estimated_order_time = #{estimatedOrderTime}