From 037194759439e7799c6728ccd15bcb716b5c7475 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 01 八月 2025 08:43:24 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 16 ++++++++--------
rsf-admin/src/page/orders/transfer/ManualCreate.jsx | 7 +++++--
rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx | 14 +++++++++-----
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
index b3efed9..34e824a 100644
--- a/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
+++ b/rsf-admin/src/page/orders/transfer/CreateBySelectMats.jsx
@@ -37,7 +37,7 @@
const CreateBySelectMats = (props) => {
- const { open, setOpen, data, setData } = props;
+ const { open, setOpen, data, setData, queryForm } = props;
const [page, setPage] = useState({ page: DEFAULT_START_PAGE, pageSize: DEFAULT_PAGE_SIZE });
const [rowCount, setRowCount] = useState(0);
const [isLoading, setIsLoading] = useState(false);
@@ -49,7 +49,9 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
-
+ console.log("-----=====>");
+ console.log(queryForm);
+
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
@@ -97,13 +99,15 @@
};
const getData = async () => {
- setIsLoading(true)
- const res = await request.post(`/transfer/locs/items`, {
+ let params = {
...formData,
+ orgAreaId: queryForm?.orgAreaId,
current: page?.page,
pageSize: page?.pageSize,
orderBy: "create_time desc"
- });
+ };
+ setIsLoading(true)
+ const res = await request.post(`/transfer/locs/items`, params);
if (res?.data?.code === 200) {
const { data } = res.data;
setTableData(data?.records);
diff --git a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
index 3704528..00ac693 100644
--- a/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
+++ b/rsf-admin/src/page/orders/transfer/ManualCreate.jsx
@@ -148,6 +148,8 @@
notify("鐩爣搴撳尯涓嶈兘涓虹┖锛侊紒", { type: 'error' })
return
}
+ console.log(formData);
+
setCreateDialog(true)
}
@@ -216,11 +218,12 @@
</Button>
</Toolbar>
<CreateBySelectMats
+ data={tabelData}
+ queryForm={formData}
open={createDialog}
setOpen={setCreateDialog}
selectedRows={selectedRows}
setSelectedRows={setSelectedRows}
- data={tabelData}
setData={setTableData}
/>
</Box>
@@ -468,7 +471,7 @@
const tableIds = tabelData.map(map => map.id);
// setSelectedRows(tableIds);
// // console.log(selectedRows);
-
+
return (
<Box>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
index 2fb5570..634c151 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
@@ -350,20 +350,20 @@
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
.eq(!Objects.isNull(params.getOrgAreaId()), Loc::getAreaId, params.getOrgAreaId()));
-
- Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
- QueryWrapper<LocItem> wrapper = new QueryWrapper<>();
- wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec, loc_id ")
- .lambda()
- .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
- .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
if (!locs.isEmpty()) {
+ Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ QueryWrapper<LocItem> wrapper = new QueryWrapper<>();
+ wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec, loc_id ")
+ .lambda()
+ .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
+ .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
Set<Long> locIds = locs.stream().map(Loc::getId).collect(Collectors.toSet());
wrapper.lambda().in(LocItem::getLocId, locIds)
.groupBy(LocItem::getBatch, LocItem::getFieldsIndex, LocItem::getMatnrCode);
return locItemService.page(page, wrapper);
} else {
- return locItemService.page(page, wrapper);
+ IPage<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ return page;
}
}
}
--
Gitblit v1.9.1