diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index f7ce7869b..24e5b8981 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -16,6 +16,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { * 单据号 */ private String orderIdFk; + private String keyWords; /** * 耗材字典ID diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index cc532bb24..cd5aefb43 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -33,11 +33,17 @@ FROM io_order_detail_result a2 LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp + left join auth_warehouse aw on aw.code = a1.fromInvCode + + a1.status = 7 AND a2.orderIdFk = #{orderIdFk} + + AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%')) + AND a2.nameCode = #{nameCode}