PDA任务转接只显示仓库绑定的用户，盘点详情显示物料批次属性

2026-03-13 11:35:34 +08:00
parent 1d1adc61e8
commit 63b3e26d5f
6 changed files with 178 additions and 44 deletions
@@ -31,6 +31,7 @@ import com.mhd.system.api.OrganizationServiceFeign;
 import com.mhd.system.api.TicketServiceFeign;
 import com.mhd.system.api.TransportFeign;
 import com.mhd.system.api.domain.PlatformUserDTO;
+import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
 import com.mhd.system.api.domain.WlhyLoginUser;
 import com.mhd.system.api.domain.finance.AccountCashWalletPo;
 import com.mhd.system.api.service.webSocket.AsyncWebSocketApplicationService;
@@ -239,6 +240,35 @@ public class UserApplicationService {
        return userPoList;
    }

+    /**
+     * PDA任务转交：只查询当前仓库绑定的用户列表
+     * @param userDo 查询条件
+     * @return 当前仓库绑定的用户列表
+     */
+    public List<UserPo> selectListForTaskHandover(UserDO userDo) {
+        // 获取当前用户设置的仓库
+        AjaxResult warehouseResult = systemServiceFeign.getWarehouseInfo();
+        if (!"200".equals(String.valueOf(warehouseResult.get("code")))) {
+            return Collections.emptyList();
+        }
+        AssociationWarehouseCacheDO warehouseCache = JSON.parseObject(JSONUtil.toJsonStr(warehouseResult.get("data")), AssociationWarehouseCacheDO.class);
+        if (warehouseCache == null || warehouseCache.getWarehouseId() == null) {
+            return Collections.emptyList();
+        }
+        // 查询该仓库绑定的用户ID列表
+        AjaxResult correlationResult = systemServiceFeign.queryListCorrelationId(warehouseCache.getWarehouseId());
+        if (!"200".equals(String.valueOf(correlationResult.get("code")))) {
+            return Collections.emptyList();
+        }
+        List<Long> warehouseUserIds = JSON.parseArray(JSONUtil.toJsonStr(correlationResult.get("data")), Long.class);
+        if (CollectionUtil.isEmpty(warehouseUserIds)) {
+            return Collections.emptyList();
+        }
+        userDo.setUserIds(warehouseUserIds);
+        startPage();
+        return userDomainService.selectList(userDo);
+    }
+
    @DataPermissions(cacheName = "tenants")
    public List<UserPo> getAllUser(UserDO userDo) {
        //这里处理身份证状态查询