From eeb96ed3c9830f996dc85cc9d4a8113aba91692b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 六月 2025 12:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2 ++
rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx | 8 +++++---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 4 +---
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 11 ++++-------
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 2 +-
rsf-admin/.env | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index 7075a86..a3c69b2 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,3 +1,3 @@
-VITE_BASE_IP=192.168.4.12
+VITE_BASE_IP=127.0.0.1
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index a74ca93..9f620ff 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -222,7 +222,7 @@
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} setManualDialog={setManualDialog}/>
</PageEditDrawer>
</Box >
)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index 92f4fe2..6bea1bd 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -96,10 +96,8 @@
const translate = useTranslate();
const [params, setParams] = useState({});
const [select, setSelect] = useState([]);
-
const [drawerVal, setDrawerVal] = useState(false);
const refresh = useRefresh();
-
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
@@ -253,7 +251,7 @@
</DialogContent>
</Grid>
<Grid>
- <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} />
+ <OutOrderPreview open={preview} setOpen={setPreview} selectedIds={select} setCloseParent={setOpen} />
</Grid>
</Dialog >
)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx b/rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx
index f8e91dc..ea4cb20 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderPreview.jsx
@@ -16,7 +16,7 @@
const OutOrderPreview = (props) => {
- const { open, setOpen, record, selectedIds } = props;
+ const { open, setOpen, record, selectedIds, setCloseParent } = props;
const translate = useTranslate();
const gridRef = useGridApiRef();
const [rows, setRows] = useState([]);
@@ -26,6 +26,7 @@
if (reason !== "backdropClick") {
// const res = await request.get(`/outStock/items/cancel/` + selectedIds);
setOpen(false);
+ setCloseParent(false)
}
};
@@ -66,7 +67,7 @@
</Grid>
</Grid>
<Toolbar sx={{ justifyContent: 'end' }}>
- <ConfirmButton label="toolbar.confirm" variant="contained" size="large" gridRef={gridRef} setOpen={setOpen} />
+ <ConfirmButton label="toolbar.confirm" variant="contained" size="large" gridRef={gridRef} setOpen={setOpen} setCloseParent={setCloseParent}/>
</Toolbar>
</DialogContent>
</Dialog>
@@ -75,7 +76,7 @@
export default OutOrderPreview;
-const ConfirmButton = ({ gridRef, setOpen }) => {
+const ConfirmButton = ({ gridRef, setOpen, setCloseParent }) => {
const refresh = useRefresh();
const notify = useNotify();
const confirm = async () => {
@@ -85,6 +86,7 @@
notify(msg);
refresh()
setOpen(false)
+ setCloseParent(false)
} else {
notify(msg);
}
diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index ce732be..6bb6a6d 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -67,7 +67,7 @@
}));
const OutStockPublic = (props) => {
- const { record, open, setOpen } = props;
+ const { record, open, setOpen, setManualDialog } = props;
const notify = useNotify();
const gridRef = useGridApiRef();
const [rows, setRows] = useState([]);
@@ -103,7 +103,6 @@
return (
<Button label="toolbar.confirm" size="medium" onClick={handleRowClick} />
)
-
};
const handleClickOpen = () => {
@@ -133,10 +132,8 @@
};
useEffect(() => {
- if (open) {
- getWaveRule()
- }
- }, [open, formData])
+ getWaveRule()
+ }, [open])
const getWaveRule = async () => {
if (formData.waveId == null && formData.waveId == undefined) {
@@ -144,7 +141,7 @@
}
const { data: { code, data, msg } } = await request.post('/outStock/order/getOutTaskItems', { ...formData });
if (code === 200) {
- setRows(data)
+ // setRows(data)
setFetchRows(data)
} else {
notify(msg);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index cc71aeb..d8f9ad0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -193,6 +193,8 @@
.setId(null)
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setPoCode(delivery.getCode());
if (!this.save(order)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
--
Gitblit v1.9.1