From 706703df2c073386556b49d31bcdbc81b3b865f0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 22 五月 2025 15:18:24 +0800
Subject: [PATCH] #出库作业
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 20 ++++++++++++++++++++
rsf-admin/src/page/outWork/outBound/StaSelect.jsx | 2 +-
rsf-admin/src/page/outWork/outBound/OutBoundList.jsx | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx b/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
index d3ea701..e7bf5b2 100644
--- a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
@@ -131,7 +131,7 @@
console.log("绔欑偣宸查�夋嫨:", e.target.value);
}}
size="small"
- type="1"
+ type="[101,103]"
/>
</Stack>
<Stack direction='row' spacing={2} minWidth={200}>
diff --git a/rsf-admin/src/page/outWork/outBound/StaSelect.jsx b/rsf-admin/src/page/outWork/outBound/StaSelect.jsx
index 3a60e1c..5971aa6 100644
--- a/rsf-admin/src/page/outWork/outBound/StaSelect.jsx
+++ b/rsf-admin/src/page/outWork/outBound/StaSelect.jsx
@@ -29,7 +29,7 @@
const http = async () => {
setLoading(true);
try {
- const res = await request.post('/deviceSite/page', {
+ const res = await request.post('/selectStaList/page', {
type: type,
current: page,
pageSize: perPage
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
index bc4524a..0dd3457 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
@@ -1,6 +1,8 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -38,6 +40,24 @@
return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
}
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/selectStaList/page")
+ public R selectStaList(@RequestBody Map<String, Object> map) {
+ List<String> longs = null;
+ if (map.get("type") != null) {
+ longs = JSONArray.parseArray(map.get("type").toString(), String.class);
+ map.entrySet().removeIf(next -> next.getKey().equals("type"));
+ }
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
+
+ QueryWrapper<DeviceSite> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.lambda().in(DeviceSite::getType, longs);
+ PageParam<DeviceSite, BaseParam> page = deviceSiteService.page(pageParam, queryWrapper);
+ return R.ok().add(page );
+ }
+
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
@PostMapping("/deviceSite/list")
public R list(@RequestBody Map<String, Object> map) {
--
Gitblit v1.9.1