Browse Source

feat(inventory): 增加环境筛选功能

- 在库存查询界面添加环境筛选选项
- 后端增加根据环境 ID筛选的功能
- 更新请求模型,添加 envId 字段
jx-test
lizw-2015 5 months ago
parent
commit
c32b95b334
  1. 23
      servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
  2. 1
      servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java

23
servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java

@ -52,23 +52,26 @@ public class DeviceManager {
public static Page<LinkedHashMap<String, Object>> queryInvLpn(QueryInvLpnReq req) {
SQLQuery<LinkedHashMap<String, Object>> 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());
}

1
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;
}

Loading…
Cancel
Save