From 8ff2e4b9924a3c569867cbde5a4cf032e83f8b22 Mon Sep 17 00:00:00 2001
From: luoyifan <luoyifan@qq.com>
Date: Mon, 30 Jun 2025 00:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E7=8E=AF=E5=A2=83=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/galaxis/rcs/common/enums/BizTaskType.java  |  4 +-
 .../com/galaxis/rcs/common/enums/PlanTaskType.java |  1 -
 .../yvan/workbench/controller/EnvController.java   | 69 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/servo/src/main/java/com/galaxis/rcs/common/enums/BizTaskType.java b/servo/src/main/java/com/galaxis/rcs/common/enums/BizTaskType.java
index f4568d1..2da8940 100644
--- a/servo/src/main/java/com/galaxis/rcs/common/enums/BizTaskType.java
+++ b/servo/src/main/java/com/galaxis/rcs/common/enums/BizTaskType.java
@@ -3,7 +3,9 @@ package com.galaxis.rcs.common.enums;
 public enum BizTaskType {
     MOVE,     // 移动任务
     CHARGE,     // 充电任务
-    CARRY;      // 搬运任务
+    CARRY,      // 搬运任务
+    LOAD,       // 装载任务
+    UNLOAD;     // 卸载任务
 
     public static BizTaskType fromString(String value) {
         if (value == null)
diff --git a/servo/src/main/java/com/galaxis/rcs/common/enums/PlanTaskType.java b/servo/src/main/java/com/galaxis/rcs/common/enums/PlanTaskType.java
index 8af44bb..1f17f35 100644
--- a/servo/src/main/java/com/galaxis/rcs/common/enums/PlanTaskType.java
+++ b/servo/src/main/java/com/galaxis/rcs/common/enums/PlanTaskType.java
@@ -11,5 +11,4 @@ public enum PlanTaskType {
     UNLOAD, // 装载任务
     CHARGE,       // 充电任务
     FINISH       // 完成任务
-
 }
diff --git a/servo/src/main/java/com/yvan/workbench/controller/EnvController.java b/servo/src/main/java/com/yvan/workbench/controller/EnvController.java
index b364375..f1ef15d 100644
--- a/servo/src/main/java/com/yvan/workbench/controller/EnvController.java
+++ b/servo/src/main/java/com/yvan/workbench/controller/EnvController.java
@@ -1,8 +1,10 @@
 package com.yvan.workbench.controller;
 
 import com.galaxis.rcs.RCSService;
+import com.google.common.base.Strings;
 import com.yvan.workbench.model.entity.Model;
 import org.clever.core.Conv;
+import org.clever.core.model.response.R;
 import org.clever.data.jdbc.DaoFactory;
 import org.clever.data.jdbc.QueryDSL;
 import org.clever.data.jdbc.querydsl.utils.QueryDslUtils;
@@ -12,7 +14,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.galaxis.rcs.common.query.QLccBasContainer.lccBasContainer;
+import static com.galaxis.rcs.common.query.QLccBasExecutor.lccBasExecutor;
+import static com.galaxis.rcs.common.query.QLccBasLocation.lccBasLocation;
 import static com.galaxis.rcs.common.query.QLccEnvInfo.lccEnvInfo;
+import static com.galaxis.rcs.common.query.QLccInvLpn.lccInvLpn;
 
 public class EnvController {
     static final QueryDSL queryDSL = DaoFactory.getQueryDSL();
@@ -25,4 +31,67 @@ public class EnvController {
 
         return Model.newSuccess(list);
     }
+
+    public static R<?> getAllInv(@RequestBody Map<String, Object> params) {
+        String catalogCode = Conv.asString(params.get("catalogCode"));
+        Long envId = Conv.asLong(params.get("envId"));
+
+        if (Strings.isNullOrEmpty(catalogCode)) {
+            return R.fail("catalogCode  must not be null");
+        }
+        if (envId == null) {
+            return R.fail("envId must not be null");
+        }
+
+        var list = queryDSL.select(QueryDslUtils.linkedMap(
+                lccBasContainer.containerType,
+                lccInvLpn.lpn,
+                lccInvLpn.locCode,
+                lccBasLocation.rack,
+                lccBasLocation.bay,
+                lccBasLocation.level,
+                lccBasLocation.cell
+            ))
+            .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)
+                )
+            )
+            .where(lccInvLpn.envId.eq(envId))
+            .where(lccBasLocation.catalogCode.eq(catalogCode))
+            .fetch();
+
+        return R.success(list);
+    }
+
+    public static R<?> getAllExecutor(@RequestBody Map<String, Object> params) {
+        String catalogCode = Conv.asString(params.get("catalogCode"));
+        Long envId = Conv.asLong(params.get("envId"));
+
+        if (Strings.isNullOrEmpty(catalogCode)) {
+            return R.fail("catalogCode  must not be null");
+        }
+        if (envId == null) {
+            return R.fail("envId must not be null");
+        }
+
+        var list = queryDSL.select(QueryDslUtils.linkedMap(
+                lccBasExecutor.executorId,
+                lccBasExecutor.virtualLocationAt,
+                lccBasExecutor.virtualExecutorPayload
+            ))
+            .from(lccBasExecutor)
+            .where(lccBasExecutor.envId.eq(envId))
+            .where(lccBasExecutor.isActive.eq(true))
+            .where(lccBasExecutor.virtualFloorCode.eq(catalogCode))
+            .fetch();
+
+        return R.success(list);
+    }
 }