diff --git a/servo/src/main/java/com/yvan/workbench/controller/LccController.java b/servo/src/main/java/com/yvan/workbench/controller/LccController.java index 5d67502..654e037 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/LccController.java +++ b/servo/src/main/java/com/yvan/workbench/controller/LccController.java @@ -7,6 +7,7 @@ import com.galaxis.rcs.common.enums.LCCDirection; import com.galaxis.rcs.amr.PtrAgvItem; import com.google.common.base.Strings; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.yvan.entity.AgvStatusVo; import com.yvan.logisticsModel.LogisticsRuntimeService; import com.yvan.workbench.SpringContext; @@ -157,19 +158,43 @@ public class LccController { QueryDSL queryDsl = DaoFactory.getQueryDSL(); var rowEffect = queryDsl.insert(lccInvLpn) - .populate(inv); + .populate(inv) + .execute(); return R.success(true); } public static R getLpnLocations(@RequestBody Map params) { - String lpn = Conv.asString(params.get("lpn")); Long envId = Conv.asLong(params.get("envId")); - if (Strings.isNullOrEmpty(lpn)) { - return R.fail("lpn Must not be empty"); + if (envId == null || envId <= 0) { + return R.fail("envId Must not be empty"); } - return R.success(true); + var queryDsl = DaoFactory.getQueryDSL(); + var lpnList = queryDsl.select(QueryDslUtils.linkedMap( + lccBasContainer.lpn + )) + .from(lccBasContainer) + .where(lccBasContainer.envId.eq(envId)) + .where(lccBasContainer.isActive.eq(true)) + .fetch(); + + var locationList = queryDsl.select(QueryDslUtils.linkedMap( + lccBasLocation.locCode, + lccBasLocation.rack, + lccBasLocation.bay, + lccBasLocation.level, + lccBasLocation.cell + )) + .from(lccBasLocation) + .where(lccBasLocation.envId.eq(envId)) + .fetch(); + + Map result = Maps.newHashMap(); + result.put("lpnList", lpnList); + result.put("locationList", locationList); + + return R.success(result); } }