diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java index e7183ff8b..35ccf0fba 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -22,5 +22,7 @@ public class FilterReceiveRequest extends ListPageRequest { private String invCode; private Integer status; + private Integer type; + } diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml index 8a4395802..1084d45cd 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -37,6 +37,15 @@ AND status = #{status} + + AND (status=1 or status=2) + + + AND (status=2) + + + AND (status=3 or status=4) +