From 804911a9eab796dac5f0d161070af62dbcda4bf1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 09:09:51 +0800
Subject: [PATCH] #移库
---
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 44 ++++++++++++++++++++++++++++++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 4 +++-
2 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
index 0007d69..8177610 100644
--- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
+++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
@@ -75,19 +75,47 @@
tableRef.current = useGridApiRef();
const translate = useTranslate();
- const [orgLoc, setOrgLoc] = useState([]);
- const [tarLoc, setTarLoc] = useState([]);
+ const [orgLoc, setOrgLoc] = useState("");
+ const [tarLoc, setTarLoc] = useState("");
const [tarLocList, setTarLocList] = useState([]);
useEffect(() => {
- selectAreaNoUse();
+ if (orgLoc === "" || orgLoc.length < 7) {
+ return;
+ }
+ selectLocItem().then((is) => {
+ if (is) {
+ selectAreaNoUse();
+ }
+
+ });
},[orgLoc])
+
+
+ const selectLocItem = async() =>{
+ const {
+ data: { code, data, msg },
+ } = await request.post("/locItem/page",{
+ locCode: orgLoc,
+ current: 1,
+ pageSize: 100,
+ orderBy: "create_time desc"
+ });
+ if (code === 200) {
+ if(data.total !== 0) {
+ setTableData(data.records);
+ return true;
+ }
+
+ }
+ return false;
+ }
const selectAreaNoUse = async() =>{
const {
data: { code, data, msg },
} = await request.post("/loc/areaNoUse/list",{
-
+ locCode: orgLoc
});
if (code === 200) {
const newData = data.map((item) => {
@@ -308,7 +336,7 @@
flex: 1,
editable: false
}))
- setColumns([...columns, ...cols, action])
+ setColumns([...columns, ...cols])
} else {
notify(msg);
}
@@ -340,7 +368,8 @@
<DataGrid
apiRef={tableRef}
rows={tabelData}
- columns={columns}
+ columns={columns}
+ checkboxSelection = {false}
disableRowSelectionOnClick
getRowId={(row) => row.matnrId ? row.matnrId : row.id}
disableColumnFilter
@@ -356,8 +385,7 @@
},
}}
pageSizeOptions={[10, 25, 50, 100]}
- editMode="row"
- checkboxSelection
+ editMode="row"
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
sx={{
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 7b981c9..33d6939 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -61,7 +61,9 @@
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/loc/areaNoUse/list")
public R areaNoUselist(@RequestBody Map<String, Object> map) {
- List<Loc> list = locService.list();
+ String locCode = map.get("locCode").toString();
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, loc.getAreaId()));
List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
return R.ok(list1);
}
--
Gitblit v1.9.1