From f2e83368a78e7a1ec17bded1677bb1d7efb5a962 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 17:09:29 +0800
Subject: [PATCH] #出库作业
---
rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx | 6 +++---
rsf-admin/src/page/outWork/outBound/OutBoundList.jsx | 8 +++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 30 ++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx b/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
index a39519e..45573d3 100644
--- a/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/outWork/outBound/OutBoundList.jsx
@@ -65,9 +65,7 @@
const [createDialog, setCreateDialog] = useState(false);
const [tabelData, setTableData] = useState([]);
const [selectedRows, setSelectedRows] = useState([]);
- const [sta,setSta] = useState([
-
- ])
+ const [sta,setSta] = useState("");
const notify = useNotify();
const tableRef = useRef();
tableRef.current = useGridApiRef();
@@ -118,7 +116,7 @@
<Grid container spacing={2}>
<Grid item xs={12}>
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'flex-start', gap: 1 }}>
- <Typography width={100} vvariant="h6" gutterBottom>
+ <Typography variant="h6" >
{translate('table.field.outBound.outSta')}
</Typography>
<Stack direction='row' spacing={2} minWidth={200}>
@@ -167,7 +165,7 @@
const notify = useNotify();
const { sta, data } = props;
const check = ()=>{
- if(sta === ""){
+ if(sta === "" || sta === undefined || sta === null){
notify("璇烽�夋嫨绔欑偣");
return;
}
diff --git a/rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx b/rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx
index 22de8aa..69916c3 100644
--- a/rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx
+++ b/rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx
@@ -68,7 +68,7 @@
};
const getData = async () => {
- const res = await request.post(`/locItem/page`, {
+ const res = await request.post(`/locItem/useO/page`, {
...formData,
current: 1,
pageSize: 100,
@@ -112,7 +112,7 @@
<DialogContent sx={{ mt: 2 }}>
<Box component="form" onSubmit={handleSubmit} sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
<Grid container spacing={2}>
- <Grid item md={4}>
+ <Grid item md={2}>
<TextField
label={translate('table.field.locItem.maktx')}
name="maktx"
@@ -121,7 +121,7 @@
size="small"
/>
</Grid>
- <Grid item md={4}>
+ <Grid item md={2}>
<TextField
label={translate('table.field.locItem.matnrCode')}
name="matnrCode"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index 2ef4102..65b395f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
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;
@@ -14,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.enums.LocStsType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -48,6 +50,34 @@
}
@PreAuthorize("hasAuthority('manager:locItem:list')")
+ @PostMapping("/locItem/useO/page")
+ public R locUseOPage(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
+ QueryWrapper<LocItem> locItemQueryWrapper = pageParam.buildWrapper(true);
+ String applySql = String.format(
+ "EXISTS (SELECT 1 FROM man_loc ml " +
+ "WHERE ml.use_status = '%s'" +
+ "AND ml.id = man_loc_item.loc_id " +
+ ")",
+ LocStsType.LOC_STS_TYPE_F.type
+ );
+ locItemQueryWrapper.apply(applySql);
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, locItemQueryWrapper);
+ List<LocItem> records = page.getRecords();
+ for (LocItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locItem:list')")
@PostMapping("/locItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(locItemService.list());
--
Gitblit v1.9.1