#前端

zjj

4 天以前 8900f9da1c540112c798309eb789ab007e922c8e

#前端

 rsf-admin/src/i18n/en.js

@@ -842,6 +842,7 @@
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
            },
            waveItem: {
                waveId: "waveId",

 rsf-admin/src/i18n/zh.js

@@ -435,7 +435,7 @@
                splrId: "供应商标识",
                weight: "收货重量",
                prodTime: "生产日期",
                splrBtch: "供应商批次",
                splrBtch: "批次",
            },
            loc: {
                warehouseId: "所属仓库",
@@ -681,7 +681,7 @@
                purQty: "下单数量",
                purUnit: "单位",
                qty: "完成数量",
                splrBatch: "供应商批次",
                splrBatch: "批次",
                splrCode: "供应商编码",
                splrName: "供应商名称",
                qrcode: "二维码",
@@ -719,7 +719,7 @@
                purUnit: "采购单位",
                qty: "已完成数量",
                splrCode: "供应商编码",
                splrBatch: "供应商批次",
                splrBatch: "批次",
                splrName: "供应商名称",
                qrcode: "二维码",
                trackCode: "条形码",
@@ -771,7 +771,7 @@
                printQty: "打印数量",
                splrName: "供应商名称",
                splrCode: "供应商编码",
                splrBatch: "供应商批次",
                splrBatch: "批次",
            },
            purchaseItem: {
                purchaseId: "PO主单标识",
@@ -786,7 +786,7 @@
                printQty: "打印数量",
                splrName: "供应商名称",
                splrCode: "供应商编码",
                splrBatch: "供应商批次",
                splrBatch: "批次",
            },
            fields: {
                fields: "字段",
@@ -872,6 +872,7 @@
                groupQty: '品类数',
                qty: "完成数量",
                orderNum: "单据数",
                progress:"进度"
            },
            waveItem: {
                waveId: "波次ID",
@@ -880,7 +881,7 @@
                matnrName: "物料名称",
                matnrCode: "物料编码",
                batch: "批次",
                splrBatch: "供应商批次",
                splrBatch: "批次",
                orderCode: "源单号",
                orderItemId: "源单明细ID",
                unit: "单位",
@@ -986,7 +987,7 @@
                qty: "总数",
                splrCode: "供应商编码",
                batch: "批次",
                splrBatch: "供应商批次",
                splrBatch: "批次",
                splrName: "供应商名称",
                trackCode: "跟踪码",
                barcode: "条形码",
@@ -1011,7 +1012,7 @@
                workQty: '执行数',
                qty: '完成数',
                batch: "批次",
                splrBatch: "供应商批次",
                splrBatch: "批次",
                spec: "规格",
                model: "型号",
                fieldsIndex: "动态索引",

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx

@@ -121,14 +121,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatList.jsx

@@ -115,7 +115,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <LocAreaMatPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.locAreaMat.code" />

 rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx

@@ -95,14 +95,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx

@@ -119,7 +119,7 @@
                        <BulkDeleteButton />
                    </>}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                >
                    <NumberField source="id" />
                    {/* <TextField source="uuid" label="table.field.locType.uuid" /> */}

 rsf-admin/src/page/container/ContainerEdit.jsx

@@ -184,14 +184,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/container/ContainerList.jsx

@@ -134,7 +134,7 @@
                    preferenceKey='container'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                >
                    <NumberField source="id" />
                    {/* <TextField source="code" label="table.field.container.code" /> */}

 rsf-admin/src/page/contract/ContractEdit.jsx

@@ -89,14 +89,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/contract/ContractList.jsx

@@ -112,7 +112,7 @@
                    preferenceKey='contract'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.contract.code" />

 rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx

@@ -54,6 +54,12 @@
    '& .opt': {
        width: 200
    },
    '& .MuiTableCell-root': {
        whiteSpace: 'nowrap',
        overflow: 'visible',
        textOverflow: 'unset'
    }

}));

const filters = [

 rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx

@@ -60,6 +60,11 @@
    '& .opt': {
        width: 150
    },
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));

const filters = [
@@ -134,7 +139,7 @@
                    rowClick={'edit'}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus']}
                    omit={['id', 'createTime', 'createBy', 'memo','logisNo', 'poId', 'rleStatus$','statusBool','createBy$']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.asnOrderLog.code" />

 rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx

@@ -115,7 +115,7 @@
                    rowClick={'edit'}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <NumberField source="pakinId" label="table.field.waitPakinLog.pakinId" />

 rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx

@@ -69,14 +69,21 @@
  },
  '& .column-name': {
  },
  '& .opt': {
    width: 220
  },
  
  '& .wkType': {
    width: 110
  },
  '& .status': {
    width: 90
  },
  '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  },
  '& .opt': {
    width: 220,
    
  },
}));

@@ -163,7 +170,7 @@
            </>}
          rowClick={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$']}
          omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$','createBy$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.asnOrder.code" />

 rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx

@@ -133,14 +133,14 @@
                                />
                            </Stack>
                        </Grid>
                        <Grid item xs={8} md={2}>
                        {/* <Grid item xs={8} md={2}>
                            <Typography variant="h6" gutterBottom>
                                {translate('common.edit.title.common')}
                            </Typography>
                            <StatusSelectInput />
                            <Box mt="2em" />
                            <MemoInput />
                        </Grid>
                        </Grid> */}
                    </Grid>
                </SimpleForm>
            </Edit >

 rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx

@@ -53,6 +53,12 @@
    '& .opt': {
        width: 150
    },
    '& .MuiTableCell-root': {
        whiteSpace: 'nowrap',
        overflow: 'visible',
        textOverflow: 'unset'
    }

}));

const filters = [
@@ -121,7 +127,7 @@
                    }}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'deliveryId', 'fieldsIndex', 'printQty', 'nromQty', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'deliveryId', 'fieldsIndex', 'printQty', 'nromQty', 'createBy', 'memo','statusBool','createBy$','splrCode']}
                >
                    <NumberField source="id" />
                    <NumberField source="deliveryId" label="table.field.deliveryItem.deliveryId" />

 rsf-admin/src/page/orders/delivery/DeliveryList.jsx

@@ -58,6 +58,12 @@
    '& .opt': {
        width: 200
    },
    '& .MuiTableCell-root': {
        whiteSpace: 'nowrap',
        overflow: 'visible',
        textOverflow: 'unset'
    }

}));

const filters = [
@@ -122,7 +128,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime','qty', 'endTime', 'updateBy', 'createTime']}
                    omit={['id', 'createTime', 'createBy', 'platId', 'platCode', 'memo', 'startTime', 'endTime', 'updateBy', 'createTime','createBy$']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.delivery.code" />
@@ -131,7 +137,7 @@
                    <TextField source="wkType$" label="table.field.delivery.wkType" />
                    <TextField source="source" label="table.field.delivery.source" />
                    <NumberField source="anfme" label="table.field.delivery.anfme" />
                    <NumberField source="workQty" label="table.field.delivery.qty" />
                    <NumberField source="workQty" label="table.field.delivery.workQty" />
                    <NumberField source="qty" label="table.field.delivery.qty" />
                    <TextField source="platCode" label="table.field.delivery.platCode" />
                    <DateField source="startTime" label="table.field.delivery.startTime" showTime />

 rsf-admin/src/page/orders/outStock/OutOrderItemList.jsx

@@ -55,6 +55,12 @@
  '& .opt': {
    width: 200
  },
  '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }

}));

const filters = [
@@ -127,7 +133,7 @@
            preferenceKey='outStockItem'
            bulkActionButtons={false}
            rowClick={false}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'asnId']}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'asnId','platOrderCode']}
          >
            <NumberField source="id" />
            <NumberField source="asnId" label="table.field.outStockItem.asnId" />

 rsf-admin/src/page/orders/outStock/OutOrderList.jsx

@@ -173,7 +173,7 @@
          bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
          rowClick={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
          omit={['id', 'createTime', 'createBy$', 'memo', 'rleStatus$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.outStock.code" />

 rsf-admin/src/page/orders/purchase/PurchaseEdit.jsx

@@ -128,14 +128,14 @@
                                />
                            </Stack>
                        </Grid>
                        <Grid item xs={6} md={2}>
                        {/* <Grid item xs={6} md={2}>
                            <Typography variant="h6" gutterBottom>
                                {translate('common.edit.title.common')}
                            </Typography>
                            <StatusSelectInput />
                            <Box mt="2em" />
                            <MemoInput />
                        </Grid>
                        </Grid> */}
                    </Grid>
                </SimpleForm>
            </Edit >

 rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx

@@ -44,6 +44,11 @@
  '& .opt': {
    width: 200
  },
  '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));

const filters = [
@@ -117,7 +122,7 @@
              setSelect(record)
              setEditDialog(true)
            }}
            omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty',  'createBy', 'memo']}
            omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty',  'createBy', 'memo','splrCode','createBy$','statusBool']}
          >
            <NumberField source="id" />
            <NumberField source="purchaseId" label="table.field.purchaseItem.purchaseId" />

 rsf-admin/src/page/orders/purchase/PurchaseList.jsx

@@ -58,6 +58,11 @@
  '& .opt': {
    width: 200
  },
  '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));

const filters = [
@@ -113,7 +118,7 @@
        actions={(
          <TopToolbar>
            <FilterButton />
            <MyCreateButton onClick={() => { setCreateDialog(true) }} />
            {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
            <SelectColumnsButton preferenceKey='purchase' />
            <ImportButton value={'purchaseItem'} />
            <MyExportButton />
@@ -127,7 +132,7 @@
          rowClick={false}
          expand={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime']}
          omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime','createBy$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.purchase.code" />

 rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx

@@ -62,6 +62,11 @@
    '& .opt': {
        width: 200
    },
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));

const filters = [
@@ -130,7 +135,7 @@
                    bulkActionButtons={<BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool']}
                    omit={['id', 'createTime', 'createBy', 'memo', 'asnId', 'statusBool','createBy$']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.qlyInspect.code" />

 rsf-admin/src/page/orders/wave/WaveList.jsx

@@ -28,6 +28,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_WAVE_AUTO_EXCE } from '@/config/setting';
import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
import PauseIcon from '@mui/icons-material/Pause';
import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
import StopOutlinedIcon from '@mui/icons-material/StopOutlined';
import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
@@ -151,7 +152,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={<WavePannel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'createBy$']}
                    omit={['id', 'createTime', 'createBy', 'createBy$','memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.wave.code" />
@@ -164,8 +165,9 @@
                    <TextField source="updateBy$" label="common.field.updateBy" />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <TextField source="createBy$" label="common.field.createBy" />
                    
                    <CustomProcess source="progress" label="table.field.wave.progress" />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <CustomProcess source="progress" />
                    <TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <PauseButton />
@@ -295,7 +297,7 @@
        }
    }
    return (
        autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
        autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
    )
}

@@ -313,7 +315,7 @@
        refresh()
    }
    return (
        record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<StopCircleOutlinedIcon />} /> : <></>
        record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
    )
}

@@ -331,6 +333,6 @@
        refresh()
    }
    return (
        record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
        record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PlayArrowOutlinedIcon />} /> : <></>
    )
}

 rsf-admin/src/page/task/TaskItemList.jsx

@@ -200,7 +200,7 @@
                    rowClick={false}
                    // expand={() => <TaskItemPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode']}
                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode','statusBool']}
                >
                    {columns.map((column) => column)}
                </StyledDatagrid>}

 rsf-admin/src/page/task/TaskList.jsx

@@ -54,6 +54,12 @@
    '& .opt': {
        width: 248
    },
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
    }

}));


@@ -135,7 +141,7 @@
                    rowClick={false}
                    expand={<TaskPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
                    omit={['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
                >
                    <NumberField source="id" />
                    <TextField source="taskCode" label="table.field.task.taskCode" />

 rsf-admin/src/page/waitPakin/WaitPakinList.jsx

@@ -60,6 +60,11 @@
    '& .opt': {
        width: 210
    },
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));

const filters = [
@@ -167,7 +172,7 @@
                            {/* <BulkDeleteButton mutationMode={OPERATE_MODE} /> */}
                        </>}
                    rowClick={false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.waitPakin.code" />

 rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx

@@ -59,12 +59,6 @@
    '& .opt': {
        width: 200
    },
    '& .RaDatagrid-cell': {
        whiteSpace: 'nowrap',
        overflow: 'visible',
        textOverflow: 'unset',
        maxWidth: 'none'
    },
    '& .MuiTableCell-root': {
        whiteSpace: 'nowrap',
        overflow: 'visible',

 rsf-admin/src/page/waveRule/WaveRuleEdit.jsx

@@ -92,14 +92,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/waveRule/WaveRuleList.jsx

@@ -113,10 +113,9 @@
                <StyledDatagrid
                    preferenceKey='waveRule'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <WaveRulePanel />}
                    rowClick={(id, resource, record) => false}                    
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.waveRule.code" />