diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java index 03187b0..f7b6043 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java @@ -6,6 +6,7 @@ import java.util.Date; @Data public class LogisticsPoData { + private String cCustomer; private String orderNo; diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java index 8c4f095..368ab35 100644 --- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java +++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java @@ -21,4 +21,9 @@ public class LogisticsSearchData extends QueryPage { * 供应商名称 */ private String supplierName; + + /** + * 物料编码 + */ + private String partNo; } diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml index f6024cf..874e15b 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml @@ -39,8 +39,8 @@ diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml index 7c09909..463d72e 100644 --- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml +++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml @@ -27,6 +27,9 @@ AND s.supplier_name LIKE '%' + #{param.supplierName} + '%' + + AND d.part_no LIKE '%' + #{param.partNo} + '%' + GROUP BY d.c_flexid, h.supplier_no, @@ -37,6 +40,7 @@