verou
2025-03-29 0330693f16b106cfd8dc451ff82b8a8ebdee8963
feat:组盘
7个文件已修改
41 ■■■■ 已修改文件
rsf-admin/src/i18n/en.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/zh.js 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/asnOrder/AsnWareModal.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinList.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/en.js
@@ -623,6 +623,10 @@
                maktx: "maktx",
                matnrId: "matnrId",
                matnrCode: "matnrCode",
                asnId: "asnId",
                asnCode: "asnCode",
                asnItemId: "asnItemId",
                trackCode: "trackCode",
                anfme: "anfme",
                workQty: "workQty",
                unit: "unit",
rsf-admin/src/i18n/zh.js
@@ -512,6 +512,7 @@
                poDetlCode: "PO单编码",
                matnrId: "物料标识",
                maktx: "物料名称",
                maktxCode: "物料编码",
                anfme: "数量",
                stockUnit: "库存单位",
                purQty: "计划收货数量",
@@ -622,7 +623,7 @@
                code: "编码",
                ansId: "收货通知单号",
                asnCode: "收货通知单编码",
                barcode: "条形码",
                barcode: "容器码",
                anfme: "数量",
                ioStatus: "状态",
            },
@@ -631,6 +632,10 @@
                maktx: "物料",
                matnrId: "物料id",
                matnrCode: "物料编码",
                asnId: "收货通知单号",
                asnCode: "收货通知单编码",
                asnItemId: "收货通知单明细id",
                trackCode: "条形码",
                anfme: "数量",
                workQty: "执行中数量",
                unit: "单位",
@@ -641,14 +646,14 @@
            waitPakinLog: {
                pakinId: "组托Id",
                code: "编码",
                barcode: "条形码",
                barcode: "容器码",
                anfme: "数量",
                ioStatus: "状态",
            },
            waitPakinItemLog: {
                pakinId: "组托Id",
                pakinItemId: "组托明细Id",
                ansId: "收货通知单号",
                asnId: "收货通知单号",
                asnCode: "收货通知单编码",
                asnItemId: "收货通知单明细id",
                trackCode: "条形码",
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -275,6 +275,13 @@
            editable: true,
        },
        {
            field: 'maktxCode',
            headerName: translate('table.field.asnOrderItem.maktxCode'),
            minWidth: 100,
            flex: 1,
            editable: true,
        },
        {
            field: 'poDetlId',
            headerName: translate('table.field.asnOrderItem.poDetlId'),
            minWidth: 100,
rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -69,6 +69,7 @@
            return {
                matnrId: el.id,
                maktx: el.name,
                maktxCode: el.code,
                stockUnit: el.stockUnit || '',
                purUnit: el.purchaseUnit || '',
                ...dynamicFields
rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -127,7 +127,7 @@
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.waitPakin.code" />
                    {/* <NumberField source="ansId" label="table.field.waitPakin.ansId" /> */}
                    <TextField source="asnCode" label="table.field.waitPakin.asnCode" />
                    {/* <TextField source="asnCode" label="table.field.waitPakin.asnCode" /> */}
                    <TextField source="barcode" label="table.field.waitPakin.barcode" />
                    <NumberField source="anfme" label="table.field.waitPakin.anfme" />
                    <TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />
rsf-admin/src/page/waitPakin/WaitPakinPanel.jsx
@@ -47,7 +47,7 @@
        {
            field: 'maktx',
            headerName: translate('table.field.waitPakinItem.maktx'),
            width: 300
            width: 200
        },
        {
            field: 'matnrId',
@@ -58,6 +58,14 @@
            headerName: translate('table.field.waitPakinItem.matnrCode')
        },
        {
            field: 'asnCode',
            headerName: translate('table.field.waitPakinItem.asnCode')
        },
        {
            field: 'trackCode',
            headerName: translate('table.field.waitPakinItem.trackCode')
        },
        {
            field: 'anfme',
            headerName: translate('table.field.waitPakinItem.anfme')
        },
rsf-admin/src/page/waitPakinLog/WaitPakinLogPanel.jsx
@@ -23,8 +23,12 @@
    const [maktx, setMaktx] = useState('');
    const pakinId = record.id;
    useEffect(() => {
        debouncedHttp({ maktx });
    }, [pakinId, maktx]);
    const http = async (parmas) => {
        const res = await request.post('/WaitPakinLog/page', { ...parmas, pakinId });
        const res = await request.post('/waitPakinItemLog/page', { ...parmas, pakinId });
        if (res?.data?.code === 200) {
            setRows(res.data.data.records)
        } else {