库存字段顺序优化

lbq

1 天以前 747c450bd0e2fe8b989e2ba514f35c58625b8a01

库存字段顺序优化

 rsf-admin/src/i18n/zh.js

@@ -869,13 +869,13 @@
                platItemId: '行号'
            },
            asnOrderLog: {
                code: "编码",
                code: "单据编码",
                poCode: "PO编码",
                poId: "PO标识",
                type: "单据类型",
                wkType: "业务类型",
                anfme: "计划数量",
                qty: "已完成数量",
                anfme: "应收数量",
                qty: "实收数量",
                logisNo: "物流单号",
                arrTime: "预计到达时间",
                rleStatus: "释放状态",
@@ -1217,7 +1217,7 @@
                matnrId: "物料ID",
                maktx: "物料名称",
                unit: '单位',
                anfme: '数量',
                anfme: '订单数量',
                outQty: '调整数量',
                matnrCode: "物料编码",
                trackCode: "跟踪码",
@@ -1225,7 +1225,7 @@
                diffQty: '差异数量',
                reviseQty: '实际数量',
                deadTime: '停留时间（天）',
                qty: '完成数',
                qty: '完成数量',
                batch: "批次",
                splrBatch: "批次",
                spec: "规格",

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

@@ -148,7 +148,8 @@
                    rowClick={'edit'}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$', 'statusBool', 'createBy$']}
                    omit={['id', 'poId', 'arrTime', 'createTime', 'createBy', 'memo', 'logisNo', 'rleStatus$', 'createBy$', 'ntyStatus$',
                        'poCode', 'type$']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.asnOrderLog.code" />
@@ -158,18 +159,26 @@
                    <TextField source="wkType$" label="table.field.asnOrderLog.wkType" />
                    <NumberField source="anfme" label="table.field.asnOrderLog.anfme" />
                    <NumberField source="qty" label="table.field.asnOrderLog.qty" />
                    <TextField source="logisNo" label="table.field.asnOrderLog.logisNo" />
                    <DateField source="arrTime" label="table.field.asnOrderLog.arrTime" showTime />
                    <TextField source="rleStatus$" label="table.field.asnOrderLog.rleStatus" sortable={false} />
                    {/* <TextField source="logisNo" label="table.field.asnOrderLog.logisNo" /> */}
                    {/* <DateField source="arrTime" label="table.field.asnOrderLog.arrTime" showTime /> */}
                    {/* <TextField source="rleStatus$" label="table.field.asnOrderLog.rleStatus" sortable={false} /> */}
                    {/* 银座新增 */}
                    <TextField source="purchaseOrgName" label="采购组织" />
                    <TextField source="purchaseUserName" label="采购员" />
                    <TextField source="purchaseDate" label="采购日期" />
                    <TextField source="supplierId" label="供应商编码" />
                    <TextField source="supplierName" label="供应商" />

                    <TextField source="ntyStatus$" label="table.field.asnOrderLog.ntyStatus" sortable={false} />
                    <TextField source="updateBy$" label="common.field.updateBy" />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <TextField source="updateBy$" label="common.field.updateBy" />                    
                    <TextField source="createBy$" label="common.field.createBy" />
                    <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">
                        <ContinueButton />
                        <EditButton label="toolbar.detail"></EditButton>                        
                        {/* <ContinueButton /> */}
                    </WrapperField>
                </StyledDatagrid>
            </List>

 rsf-admin/src/page/locPreview/LocPreviewEdit.jsx

@@ -112,34 +112,6 @@
                                        validate={required()}
                                        readOnly
                                    />
                                    <NumberInput
                                        label="table.field.loc.length"
                                        source="length"
                                        readOnly
                                    />

                                    <NumberInput
                                        label="table.field.loc.width"
                                        source="width"
                                        readOnly
                                    />

                                    <NumberInput
                                        label="table.field.loc.height"
                                        source="height"
                                        readOnly
                                    />
                                </Grid>
                                <Grid item display="flex" gap={1}>
                                    <ReferenceArrayInput source="typeIds" reference="locType" >
                                        <SelectArrayInput label="table.field.loc.type"  readOnly/>
                                    </ReferenceArrayInput>
                                    <TextInput
                                        label="table.field.loc.unit"
                                        source="unit"
                                        parse={v => v}
                                        readOnly
                                    />
                                    <DictionarySelect
                                        label={translate("table.field.loc.useStatus")}
                                        name="useStatus"
@@ -148,13 +120,38 @@
                                        dictTypeCode="sys_loc_use_stas"
                                        readOnly
                                    />
                                    {/* <ReferenceArrayInput source="typeIds" reference="locType" >
                                        <SelectArrayInput label="table.field.loc.type"  readOnly/>
                                    </ReferenceArrayInput>
                                    <TextInput
                                        label="table.field.loc.unit"
                                        source="unit"
                                        parse={v => v}
                                        readOnly
                                    /> */}
                                </Grid>
                                <Grid item display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.loc.length"
                                        source="length"
                                        readOnly
                                    />
                                    <NumberInput
                                        label="table.field.loc.width"
                                        source="width"
                                        readOnly
                                    />
                                    <NumberInput
                                        label="table.field.loc.height"
                                        source="height"
                                        readOnly
                                    />
                                    <NumberInput
                                        label="table.field.loc.row"
                                        source="row"
                                        validate={required()}
                                        readOnly
                                    />

                                    <NumberInput
                                        label="table.field.loc.col"
                                        source="col"

 rsf-admin/src/page/locPreview/LocPreviewItems.jsx

@@ -160,30 +160,32 @@
                <NumberField source="locId" label="table.field.locItem.locId" />,
                <TextField source="wareArea" label="table.field.locItem.wareArea" />,
                <TextField source="locCode" label="table.field.locItem.locCode" />,
                <NumberField source="wkType$" label="table.field.locItem.wkType" />,
                <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
                <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
                <NumberField source="orderId" label="table.field.locItem.orderId" />,
                <TextField source="type$" label="table.field.locItem.type" />,
                <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />,
                <NumberField source="wkType$" label="table.field.locItem.wkType" />,
                <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />,                
                <NumberField source="matnrId" label="table.field.locItem.matnrId" />,
                <TextField source="matnrCode" label="table.field.locItem.matnrCode" />,
                <TextField source="maktx" label="table.field.locItem.maktx" />,
                <TextField source="spec" label="table.field.locItem.spec" />,
                <TextField source="model" label="table.field.locItem.model" />,
                <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,
                <TextField source="batch" label="table.field.locItem.batch" />,
                <TextField source="trackCode" label="table.field.locItem.trackCode" />,
                <TextField source="unit" label="table.field.locItem.unit" />,
                <TextField source="trackCode" label="table.field.locItem.trackCode" />,                
                <NumberField source="anfme" label="table.field.locItem.anfme" />,
                <NumberField source="workQty" label="table.field.locItem.workQty" />,
                <NumberField source="qty" label="table.field.locItem.qty" />,
                <TextField source="splrBatch" label="table.field.locItem.splrBatch" />,
                <TextField source="unit" label="table.field.locItem.unit" />,
                <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
            ]
            const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
            const lastArr = [
                <TextField source="updateBy$" label="common.field.updateBy" />,
                <DateField source="updateTime" label="common.field.updateTime" showTime />,
                <TextField source="createBy$" label="common.field.createBy" />,
                <TextField source="updateBy$" label="common.field.updateBy" />,                
                <DateField source="createTime" label="common.field.createTime" showTime />,
                <TextField source="createBy$" label="common.field.createBy" />,               
                <BooleanField source="statusBool" label="common.field.status" sortable={false} />,
                <TextField source="memo" label="common.field.memo" sortable={false} />,
            ]
@@ -213,7 +215,9 @@
                    rowClick={false}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool']}
                    omit={['id', 'createTime', 'spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'batch', 'createBy$', 'memo', 'fieldsIndex', 'statusBool', 'extendFields.[palletId]', 
                        'wareArea', 'locCode', 'type$', 'workQty', 'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]', 'extendFields.[targetWareHouseId]', 'extendFields.[sourceWareHouseId]'
                    ]}
                >
                    {columns.map((column) => column)}
                </StyledDatagrid>}

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

@@ -180,14 +180,14 @@
              'businessTime', 'extendFields.[businessTime]',
              'wkType', 'extendFields.[wkType]',
              'type', 'extendFields.[type]',
              'priceUnitId', 'purUnit', 'extendFields.[priceUnitId]',
              'priceUnitId', 'purUnit',
              'id', 'orderId', 'orderCode', 'poCode', 'poId','wkType', 
              'type', 'checkType', 'spec', 'model', 'purQty', 'purUnit', 
              'qrcode', 'trackCode', 'splrCode', 'splrName', 'projectCode', 
              'supplierId', 'supplierName',  'shipperId',
              // 'updateTime', 'updateBy', 'updateBy$',
              'createTime', 'createBy', 'createBy$',
              'extendFields.[inStockType]', 'extendFields.[baseUnitId]'
              'extendFields.[inStockType]', 'extendFields.[baseUnitId]', 'extendFields.[priceUnitId]'
          ];
          const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
          setColumns(columns);