skyouc
2 天以前 5193d463bbf96467d93c73a6399cdcc957babd8b
代码优化
17个文件已修改
59 ■■■■ 已修改文件
rsf-admin/src/i18n/en.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/zh.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/BindModal.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/whMat/whMatCreate.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/components/BatchButton.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/outStock/OutStockPublic.jsx 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/purchase/PurchaseCreate.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/wave/WaveItemList.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/task/TaskList.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/checkOutBound/CheckOutBoundList.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/outBound/OutBoundList.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/en.js
@@ -44,6 +44,7 @@
                main: 'Main',
                common: 'Common',
                changePwd: 'Change Password',
                insuffInventory: 'Insufficient inventory'
            },
            side: {
                title: 'More Info'
rsf-admin/src/i18n/zh.js
@@ -45,6 +45,7 @@
                main: '主要',
                common: '通用',
                changePwd: '重置密码',
                insuffInventory: '库存不足'
            },
            side: {
                title: '更多'
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()
    }
rsf-admin/src/page/basicInfo/whMat/WhMatListAside.jsx
@@ -58,7 +58,6 @@
  ]);
  const handleInput = (value) => {
    console.log(value);
    setSearchVal(value);
  };
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;
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);
    };
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)
    };
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) {
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);
        }
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();
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)
    }
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);
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -51,7 +51,6 @@
            setOpen(false);
        }
    };
    console.log(source);
    return (
        <Box>
            <Dialog
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]"
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) {
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;
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();