diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 84c717d56..a050b9244 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -197,5 +197,6 @@ public class FilterOrderRequest extends ListPageRequest {
private String unionRemark;
private String remark;
+ private String keyWords;
private Integer confirmStatus;
}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index d12eb1efe..2146274ec 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -15,6 +15,9 @@
(select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
(select name from basic_corp bc where bc.erpId = io.customerId) customerName
from io_order as io
+ left join auth_warehouse aw on aw.code = io.fromInvCode
+ left join basic_corp bc on bc.erpId = io.fromCorp
+
INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
@@ -22,6 +25,10 @@
AND id = #{id}
+
+ AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))
+
+
AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
concat('%', #{corpName}, '%')
@@ -85,7 +92,7 @@
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
- AND status in
+ AND io.status in
#{item}
@@ -103,7 +110,7 @@
- AND status = #{status}
+ AND io.status = #{status}
AND orderType = #{orderType}
@@ -115,7 +122,7 @@
#{item}
- and status = 10)
+ and io.status = 10)
@@ -124,7 +131,7 @@
#{item}
- and status = 7
+ and io.status = 7
)
@@ -133,13 +140,13 @@
#{item}
- and status = 10)
+ and io.status = 10)
or (
`action` in
#{item}
- and status = 7)
+ and io.status = 7)
)