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

mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java

@@ -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) {
         //这里处理身份证状态查询

mhd-user-center/src/main/java/com/mhd/user/infrastructure/feign/SystemServiceFeign.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -74,4 +75,19 @@ public interface SystemServiceFeign {
      */
     @PostMapping("/dict/data/getDictDataList")
     public R<List<SysDictData>> getDictDataList(@RequestBody SysDictData sysDictData);
+
+    /**
+     * 查询仓库关联的用户ID集合（用于PDA任务转交等场景）
+     * @param warehouseId 仓库ID
+     * @return 用户ID列表
+     */
+    @GetMapping("/associationWarehouseApi/queryListCorrelationId")
+    public AjaxResult queryListCorrelationId(@RequestParam(value = "warehouseId", required = false) Long warehouseId);
+
+    /**
+     * 获取当前登录用户设置的仓库
+     * @return 仓库信息（含warehouseId）
+     */
+    @GetMapping("/associationWarehouseApi/getWarehouseInfo")
+    public AjaxResult getWarehouseInfo();
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java

@@ -89,6 +89,16 @@ public class UserAPI extends BaseController {
         return getDataTable(list);
     }
 
+    @Log(title = "PDA任务转交-查询用户", description ="只查询当前仓库绑定的用户列表", businessType = BusinessType.INQUIRE)
+    @ApiOperation("PDA任务转交-查询当前仓库绑定的用户列表")
+    @GetMapping("/listByCurrentWarehouse")
+    public TableDataInfo listByCurrentWarehouse(UserDTO userDTO) {
+        UserDO userDO = new UserDO();
+        BeanUtils.copyProperties(userDTO, userDO);
+        List<UserPo> list = userApplicationService.selectListForTaskHandover(userDO);
+        return getDataTable(list);
+    }
+
     @Log(title = "用户中台管理-查询", description ="查询用户列表",businessType = BusinessType.INQUIRE)
     @ApiOperation("查询用户列表")
     @GetMapping("/getAllByOrganization")