parent: 565010f8 | 补丁 | 提交 | ignore whitespace
zhou zhou
18 小时以前 ae70754daf7c8542677d05506b066a7499ca95ad 
Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
7个文件已修改
57 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogEdit.jsx 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/histories/waitPakinLog/WaitPakinLogList.jsx 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -278,7 +278,7 @@


                isWcs: '是否WCS站站点',


                wcsData: 'wcs数据',


                containerType: '容器类型',


                barcode: '条码',


                barcode: '容器编码',


                autoTransfer: '自动调拨',


            },


            host: {


@@ -465,7 +465,7 @@


                flagMix: "允许混放",


            },


            warehouseAreasItem: {


                asnCode: '单号',


                asnCode: '单据编码',


                areaId: "库区ID",


                areaName: "库区名称    ",


                matnrId: "物料标识",


@@ -1163,8 +1163,8 @@


                sourceCode: "源单据",


            },


            taskItemLog: {


                taskItemId: "taskItemId",


                taskId: "taskId",


                taskItemId: "任务明细号",


                taskId: "任务号",


                orderId: "订单ID",


                orderType: "单据类型",


                orderItemId: "订单明细ID",




 rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx


@@ -133,16 +133,16 @@


                    omit={['id', 'createTime', 'createBy', 'memo', 'updateBy', 'autoTransfer']}


                >


                    <NumberField source="id" />


                    <TextField source="type$" label="table.field.basStation.type" />


                    {/* <TextField source="type$" label="table.field.basStation.type" /> */}


                    <FunctionField


                        source="type"


                        label="table.field.basStation.type"


                        render={record => record.type === 1 ? '普通站点' : '智能站点'}


                    />


                    <TextField source="stationName" label="table.field.basStation.stationName" />


                    <TextField source="stationId" label="table.field.basStation.stationId" />


                    <TextField source="useStatus$" label="table.field.basStation.useStatus" />


                    <TextField source="barcode" label="table.field.basStation.barcode" />


                    <FunctionField


                        source="type"


                        label="table.field.basStation.type"


                        render={record => record.type === 1 ? '无光电' : '光电'}


                    />


                    <FunctionField


                        source="inAble"


                        label="table.field.basStation.inAble"




 rsf-admin/src/page/histories/taskLog/TaskItemLogList.jsx


@@ -124,18 +124,22 @@


                    bulkActionButtons={false}


                    rowClick={(id, resource, record) => false}


                    expandSingle={true}


                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}


                    omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'trackCode', 'spec', 'model']}


                >


                    <NumberField source="id" />


                    <NumberField source="taskId" label="table.field.taskItemLog.taskId" />


                    <NumberField source="orderId" label="table.field.taskItemLog.orderId" />


                    <TextField source="orderType" label="table.field.taskItemLog.orderType" />


                    <NumberField source="orderItemId" label="table.field.taskItemLog.orderItemId" />


                    <NumberField source="orderType$" label="table.field.taskItem.orderType" />,


                    <NumberField source="wkType$" label="table.field.taskItem.wkType" />,


                    <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,


                    <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,


                    <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />


                    <NumberField source="source" label="table.field.taskItemLog.source" />


                    <NumberField source="matnrId" label="table.field.taskItemLog.matnrId" />


                    <TextField source="maktx" label="table.field.taskItemLog.maktx" />


                    <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />


                    <TextField source="trackCode" label="table.field.taskItemLog.trackCode" />


                    <TextField source="matnrCode" label="table.field.taskItemLog.matnrCode" />                    


                    <TextField source="unit" label="table.field.taskItemLog.unit" />


                    <NumberField source="anfme" label="table.field.taskItemLog.anfme" />


                    <TextField source="batch" label="table.field.taskItemLog.batch" />




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


@@ -132,9 +132,9 @@


                        <TextField source="id" />


                    </ReferenceField>


                    <NumberField source="pakinItemId" label="table.field.waitPakinItemLog.pakinItemId" />


                    <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />


                    {/* <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />


                    <TextField source="asnCode" label="table.field.waitPakinItemLog.asnCode" />


                    <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" />


                    <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" /> */}


                    <TextField source="trackCode" label="table.field.waitPakinItemLog.trackCode" />


                    <TextField source="maktx" label="table.field.waitPakinItemLog.maktx" />


                    <ReferenceField source="matnrId" label="table.field.waitPakinItemLog.matnrId" reference="matnr" link={false} sortable={false}>




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


@@ -76,12 +76,12 @@


                                {translate('common.edit.title.main')}


                            </Typography>


                            <Stack direction='row' gap={2}>


                                <NumberInput


                                {/* <NumberInput


                                    label="table.field.waitPakinLog.pakinId"


                                    source="pakinId"


                                    readOnly


                                    autoFocus


                                />


                                /> */}


                                <TextInput


                                    label="table.field.waitPakinLog.code"


                                    source="code"


@@ -99,7 +99,13 @@


                                    readOnly


                                    source="anfme"


                                />


                                <SelectInput


                                <TextInput


                                    label="table.field.waitPakin.ioStatus"


                                    readOnly


                                    source="ioStatus$"


                                    parse={v => v}


                                />


                                {/* <SelectInput


                                    label="table.field.waitPakinLog.ioStatus"


                                    source="ioStatus"


                                    readOnly


@@ -108,7 +114,7 @@


                                        { id: 1, name: ' 入库中' },


                                    ]}


                                    validate={required()}


                                />


                                /> */}


                            </Stack>


                        </Grid>


                    </Grid>




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


@@ -115,7 +115,7 @@


                    rowClick={'edit'}


                    expand={false}


                    expandSingle={true}


                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}


                    omit={['id', 'pakinId', 'createTime', 'createBy', 'memo','statusBool']}


                >


                    <NumberField source="id" />


                    <NumberField source="pakinId" label="table.field.waitPakinLog.pakinId" />


@@ -133,6 +133,9 @@


                    <DateField source="createTime" label="common.field.createTime" showTime />


                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />


                    <TextField source="memo" label="common.field.memo" sortable={false} />


                    <WrapperField cellClassName="opt" label="common.field.opt">


                        <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />


                    </WrapperField>


                </StyledDatagrid>


            </List>


            <PageDrawer




 rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx


@@ -193,7 +193,7 @@


                <TextField key="unit" source="unit" label="table.field.warehouseAreasItem.unit" />,


                <NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />,


                <NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />,


                <NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />,


                <NumberField key="ableQty" source="ableQty" label="table.field.warehouseAreasItem.qty" />,


                <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,                


                <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,


                // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"


@@ -215,8 +215,8 @@


            ]


            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)


            const lastArr = [


                <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,


                <TextField key="updateBy" source="updateBy$" label="common.field.updateBy" />,


                <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,                


                <TextField key="createBy" source="createBy$" label="common.field.createBy" />,


                <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,


                <BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,