diff --git a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java index 34b57a2..50c8ee9 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java +++ b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java @@ -52,23 +52,26 @@ public class DeviceManager { public static Page> queryInvLpn(QueryInvLpnReq req) { SQLQuery> query = QUERY_DSL.select(QueryDslUtils.linkedMap(lccInvLpn, lccBasLocation, lccBasContainer)) - .from(lccInvLpn) - .innerJoin(lccBasLocation).on( - lccInvLpn.locCode.eq(lccBasLocation.locCode).and( - lccBasLocation.envId.eq(lccBasLocation.envId) - ) + .from(lccInvLpn) + .innerJoin(lccBasLocation).on( + lccInvLpn.locCode.eq(lccBasLocation.locCode).and( + lccBasLocation.envId.eq(lccBasLocation.envId) ) - .innerJoin(lccBasContainer).on( - lccInvLpn.lpn.eq(lccInvLpn.lpn).and( - lccBasContainer.envId.eq(lccInvLpn.envId) - ) - ).orderBy(lccInvLpn.lpn.asc()); + ) + .innerJoin(lccBasContainer).on( + lccInvLpn.lpn.eq(lccInvLpn.lpn).and( + lccBasContainer.envId.eq(lccInvLpn.envId) + ) + ).orderBy(lccInvLpn.lpn.asc()); if (StringUtils.isNotBlank(req.getLpn())) { query.where(lccInvLpn.lpn.eq(req.getLpn().trim())); } if (StringUtils.isNotBlank(req.getLocCode())) { query.where(lccInvLpn.locCode.eq(req.getLocCode().trim())); } + if (req.getEnvId() != null) { + query.where(lccInvLpn.envId.eq(req.getEnvId())); + } return QueryDslUtils.queryByPage(query, QueryByPage.getCurrent()); } diff --git a/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java b/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java index 74f623e..5f07cc9 100644 --- a/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java +++ b/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java @@ -12,4 +12,5 @@ public class QueryInvLpnReq { private String lpn; /** 库存位置 */ private String locCode; + private Long envId; }