From 5193d463bbf96467d93c73a6399cdcc957babd8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 11 六月 2025 11:08:01 +0800
Subject: [PATCH] 代码优化
---
rsf-admin/src/page/components/BatchButton.jsx | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 4 ++--
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx | 1 -
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 2 --
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 28 ++++++++++++++++++++++++++--
rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx | 1 -
rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx | 3 ---
rsf-admin/src/page/basicInfo/loc/BindModal.jsx | 1 -
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 2 --
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 1 -
rsf-admin/src/page/task/TaskList.jsx | 1 -
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx | 1 -
rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx | 2 --
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 7 +------
rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx | 2 --
17 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index d33ba92..e114fd3 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -44,6 +44,7 @@
main: 'Main',
common: 'Common',
changePwd: 'Change Password',
+ insuffInventory: 'Insufficient inventory'
},
side: {
title: 'More Info'
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 503f03b..7f510f2 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -45,6 +45,7 @@
main: '涓昏',
common: '閫氱敤',
changePwd: '閲嶇疆瀵嗙爜',
+ insuffInventory: '搴撳瓨涓嶈冻'
},
side: {
title: '鏇村'
diff --git a/rsf-admin/src/page/basicInfo/loc/BindModal.jsx b/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
index 5b2e606..dcba413 100644
--- a/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/BindModal.jsx
@@ -246,7 +246,6 @@
const SelectMatnrs = () => {
const { selectedIds, data, isPending, onUnselectItems } = useListContext();
const clickMatnrs = () => {
- console.log(selectedIds);
onUnselectItems()
}
diff --git a/rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx b/rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx
index d8e4a5b..20a5173 100644
--- a/rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx
+++ b/rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx
@@ -58,7 +58,6 @@
]);
const handleInput = (value) => {
- console.log(value);
setSearchVal(value);
};
diff --git a/rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx b/rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx
index a32c132..fbc038f 100644
--- a/rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx
@@ -377,8 +377,6 @@
};
useEffect(() => {
- console.log(selAll);
-
const setAllChecked = (nodes, checked) => {
nodes.forEach((node) => {
node.checked = !checked;
diff --git a/rsf-admin/src/page/components/BatchButton.jsx b/rsf-admin/src/page/components/BatchButton.jsx
index 5a46f8d..c285299 100644
--- a/rsf-admin/src/page/components/BatchButton.jsx
+++ b/rsf-admin/src/page/components/BatchButton.jsx
@@ -6,7 +6,6 @@
const ImportButton = (props) => {
const [modalOpen, setModalOpen] = useState(false);
const { selectedIds } = useListContext();
- console.log(selectedIds)
const handleOpenModal = () => {
setModalOpen(true);
};
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index a865030..acf72ae 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -106,7 +106,6 @@
...prevData,
[name]: value
}));
- console.log(formData);
};
const resetData = () => {
@@ -344,7 +343,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
@@ -447,7 +445,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
@@ -676,9 +673,7 @@
};
- const handleSelectionChange = (ids) => {
- console.log(ids);
-
+ const handleSelectionChange = (ids) => {
setSelectedRows(ids)
};
diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index 6836a37..3a9f70b 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -47,6 +47,7 @@
import ConfirmButton from '../../components/ConfirmButton';
import { Delete, Edit, Add } from '@mui/icons-material';
import OutStockSiteDialog from "./OutStockSiteDialog";
+import { color } from "framer-motion";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -210,6 +211,7 @@
const PreviewTable = ({ rows, gridRef, setRows, record, selectedIds, setSelectedIds, setDialog }) => {
gridRef.current = useGridApiRef();
+ const translate = useTranslate();
const columns = [
// { field: 'id', headerName: 'ID', width: 40 },
@@ -218,7 +220,13 @@
{ field: 'matnrCode', headerName: '鐗╂枡缂栫爜', width: 120 },
{ field: 'batch', headerName: '鎵规', width: 90 },
{ field: 'unit', headerName: '鍗曚綅', width: 60 },
- { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110 ,valueFormatter: (val) => val <= 0 ? '搴撳瓨涓嶈冻' : val,},
+ { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110, },
+ {
+ field: 'anfme', headerName: '搴撳瓨鏁伴噺', width: 110,
+ renderCell: (params) => (
+ <OutStockAnfme value={params.value} />
+ )
+ },
{
field: 'siteNo',
headerName: '鍑哄簱鍙�',
@@ -257,6 +265,23 @@
})
setRows(outRows)
}
+
+ const OutStockAnfme = React.memo(function OutStockAnfme(props) {
+ const { value } = props;
+ return (
+ value > 0 ?
+ <Box
+ sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}
+ >
+ <span>{value}</span>
+ </Box> :
+ <Box
+ sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}
+ >
+ <span style={{color: 'red'}}>{translate('common.edit.title.insuffInventory')}</span>
+ </Box>
+ );
+ });
const OutStockSiteNo = React.memo(function OutStockSiteNo(props) {
const { value } = props;
@@ -375,7 +400,6 @@
const refresh = useRefresh();
const redirect = useRedirect();
const submit = async () => {
- console.log(record);
const items = gridRef.current?.getSortedRows();
const { data: { code, data, msg } } = await request.post('/outStock/generate/tasks', { items, outId: record?.id });
if (code == 200) {
diff --git a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
index 56b4dc3..ca4245f 100644
--- a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
@@ -100,7 +100,6 @@
...prevData,
[name]: value
}));
- console.log(formData);
};
const resetData = () => {
@@ -319,7 +318,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
@@ -373,7 +371,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx b/rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx
index 5f37416..14650e6 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx
@@ -35,8 +35,6 @@
const { open, setOpen } = props;
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_in_stock_type')) || [];
const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type'))?.filter(data => (data.group == '1')) || [];
- console.log(business);
-
const translate = useTranslate();
const notify = useNotify();
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index ba3a37d..6dc7a54 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -177,7 +177,6 @@
const DetailButton = (setEditDialog) => {
const record = useRecordContext();
const editClick = (event) => {
- console.log('--========--->');
event.stopPropagation()
setEditDialog(true)
}
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index d0bdae8..6fc9e5b 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -272,7 +272,6 @@
};
//鍙栨秷浠诲姟
const cancleTask = async (row) => {
- console.log(row);
const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
if (code === 200) {
notify(msg);
diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index d152bb5..cb61972 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -51,7 +51,6 @@
setOpen(false);
}
};
- console.log(source);
return (
<Box>
<Dialog
diff --git a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
index d28751b..89f8a5e 100644
--- a/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
+++ b/rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx
@@ -128,7 +128,6 @@
label={translate("table.field.outBound.checkSta")}
onChange={(e) => {
setSta(e.target.value);
- console.log("绔欑偣宸查�夋嫨:", e.target.value);
}}
size="small"
type="[107]"
diff --git a/rsf-admin/src/page/work/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
index 404f546..348571c 100644
--- a/rsf-admin/src/page/work/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -127,7 +127,6 @@
label={translate("table.field.outBound.outSta")}
onChange={(e) => {
setSta(e.target.value);
- console.log("绔欑偣宸查�夋嫨:", e.target.value);
}}
size="small"
type="[101,103]"
@@ -181,7 +180,6 @@
http(sta, data);
}
const http = async (sta, items) => {
- console.log(items);
// const filZores = items.filter(item => item.outQty <= 0.0);
// const filter = items.filter(item => (item.outQty + item.workQty) > item.anfme);
// if (filter.length > 0 || filZores.length > 0) {
diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
index 5c4bce0..a036f5e 100644
--- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
+++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
@@ -125,7 +125,6 @@
}
})
- console.log(newData);
setTarLocList(newData);
}
@@ -216,7 +215,6 @@
const refresh = useRefresh();
const { orgLoc, tarLoc, tabelData } = props;
const move = () => {
- console.log(orgLoc, tarLoc);
if (orgLoc === "" || orgLoc === undefined || orgLoc === null) {
notify("璇疯緭鍏ユ簮搴撲綅");
return;
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 ff095e0..0a0c2f0 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
@@ -626,8 +626,8 @@
.setMatnrCode(asnOrderItem.getMatnrCode())
.setMaktx(asnOrderItem.getMaktx())
.setAnfme(0.00)
- .setOutQty(0.00)
- .setWorkQty(0.00)
+ .setWorkQty(issued.doubleValue())
+ .setOutQty(issued.doubleValue())
.setUnit(asnOrderItem.getStockUnit())
.setBatch(asnOrderItem.getSplrBatch());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
--
Gitblit v1.9.1