diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java index 57c8fbe0..2af32bc3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderSearchQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @Data @@ -26,4 +27,10 @@ public class SRMOrderSearchQO extends SearchBaseQO { */ private String itemCode; + /** + * 是否已完结 + */ + @JsonProperty("isCompleted") + private Boolean isCompleted; + } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java index 59977db6..b0fedd13 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java @@ -19,4 +19,9 @@ public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{ * 供应商编号 */ private String supplierNo; + + /** + * 状态,0:待收货;1:收货中;2:已收货 + */ + private Short state; } \ No newline at end of file diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml index ab44a11c..f58136aa 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml @@ -6,8 +6,8 @@ from wms_srm_order a left join user_supplier b on a.supplier_num=b.supplier_code - - and a.note_num ilike concat('%', #{request.noteNum}, '%') + + a.is_completed = #{request.isCompleted} and a.supplier_num =#{request.supplierNum} @@ -26,6 +26,9 @@ and a.create_time < #{request.endDate} + + and a.note_num ilike concat('%', #{request.noteNum}, '%') + order by a.id desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml index f731820f..28d82ebd 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml @@ -24,6 +24,9 @@ + + and pdo.state=#{request.state} + and us.supplier_code=#{request.supplierNo}