代码优化

skyouc

3 天以前 8ad7614fd797123b0d19d9323c3f9a4552702c29

代码优化

 rsf-admin/src/i18n/zh.js

@@ -649,8 +649,8 @@
                exceStatus: '执行状态'
            },
            asnOrderItem: {
                asnId: "主单标识",
                asnCode: "单号",
                orderId: "主单标识",
                orderCode: "单号",
                poDetlId: "PO单ID",
                poDetlCode: "PO单",
                platItemId: '行号',
@@ -682,8 +682,8 @@
                prodTime: "生产日期",
            },
            outStockItem: {
                asnId: "主单标识",
                asnCode: "单号",
                orderId: "主单标识",
                orderCode: "单号",
                poCode: 'DO单号',
                poDetlId: "平台明细ID",
                poDetlCode: "DO单",
@@ -721,8 +721,8 @@
                ntyStatus: "质检上报状态",
            },
            asnOrderItemLog: {
                asnId: "主单标识",
                asnCode: "主单编码",
                orderId: "主单标识",
                orderCode: "主单编码",
                platItemId: "erp标识",
                poDetlId: "PO单标识",
                poDetlCode: "PO单编码",

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

@@ -65,8 +65,8 @@
const filters = [
    <SearchInput source="condition" alwaysOn />,

    <NumberInput source="asnId" label="table.field.asnOrderItemLog.asnId" />,
    <TextInput source="asnCode" label="table.field.asnOrderItemLog.asnCode" />,
    <NumberInput source="orderId" label="table.field.asnOrderItemLog.orderId" />,
    <TextInput source="orderCode" label="table.field.asnOrderItemLog.orderCode" />,
    <TextInput source="platItemId" label="table.field.asnOrderItemLog.platItemId" />,
    <NumberInput source="poDetlId" label="table.field.asnOrderItemLog.poDetlId" />,
    <TextInput source="poCode" label="table.field.asnOrderItemLog.poCode" />,
@@ -141,7 +141,7 @@
                    preferenceKey='asnOrderItemLog'
                    bulkActionButtons={false}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'asnId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$']}
                    omit={['id', 'orderId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$']}
                >
                    <NumberField source="id" />
                    <NumberField source="asnId" label="table.field.asnOrderItemLog.asnId" />

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

@@ -85,15 +85,15 @@
                            <Grid>
                                <Grid item xs={6} display="flex" gap={2}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.asnId"
                                        source="asnId"
                                        label="table.field.asnOrderItem.orderId"
                                        source="orderId"
                                        readOnly
                                        hidden
                                        defaultValue={record?.id}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.asnCode"
                                        source="asnCode"
                                        label="table.field.asnOrderItem.orderCode"
                                        source="orderCode"
                                        readOnly
                                        defaultValue={record?.code}
                                        parse={v => v}

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

@@ -93,13 +93,13 @@
                            <Grid item xs={24} md={14}>
                                <Stack direction='row' gap={2}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.asnId"
                                        source="asnId"
                                        label="table.field.asnOrderItem.orderId"
                                        source="orderId"
                                        readOnly
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.asnCode"
                                        source="asnCode"
                                        label="table.field.asnOrderItem.orderCode"
                                        source="orderCode"
                                        readOnly
                                        parse={v => v}
                                    />

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

@@ -65,8 +65,8 @@

const filters = [
  <SearchInput source="condition" alwaysOn />,
  <NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
  <TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
  <NumberInput source="orderId" label="table.field.asnOrderItem.orderId" />,
  <TextInput source="orderCode" label="table.field.asnOrderItem.orderCode" />,
  <TextInput source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
  <TextInput source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
  <TextInput source="matnrId" label="table.field.asnOrderItem.matnrId" />,
@@ -121,7 +121,7 @@
          }}
          title={"menu.asnOrderItem"}
          empty={false}
          filter={{ asnId: asnId }}
          filter={{ orderId: asnId }}
          filters={filters}
          sort={{ field: "create_time", order: "desc" }}
          actions={(
@@ -176,8 +176,8 @@
    if (code == 200) {
      const arr = [
        <NumberField source="id" />,
        <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />,
        <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />,
        <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
        <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
        <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
        <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
        <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
@@ -238,7 +238,7 @@
          preferenceKey='asnOrderItem'
          bulkActionButtons={false}
          rowClick={(id, resource, record) => false}
          omit={['id', 'asnId', 'asnCode', 'poDetlId', 'poDetlCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
        >
          {columns.map((column) => column)}
        </StyledDatagrid>}

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

@@ -47,12 +47,12 @@

    const columns = [
        {
            field: 'asnId',
            headerName: translate('table.field.asnOrderItem.asnId')
            field: 'orderId',
            headerName: translate('table.field.asnOrderItem.orderId')
        },
        {
            field: 'asnCode',
            headerName: translate('table.field.asnOrderItem.asnCode'),
            field: 'orderCode',
            headerName: translate('table.field.asnOrderItem.orderCode'),
            width: 150,
        },
        // {

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

@@ -171,7 +171,7 @@
            resource="asnOrderItem"
            title={"menu.asnOrderItem"}
            empty={false}
            filter={{ asnId: record?.id }}
            filter={{ orderId: record?.id }}
            sort={{ field: "create_time", order: "desc" }}
            actions={(
                <></>
@@ -199,8 +199,8 @@
        const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
        if (code == 200) {
            const arr = [
                <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />,
                <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />,
                <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
                <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
                <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
                <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
                <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
@@ -246,7 +246,7 @@
                    preferenceKey='asnOrderItem'
                    bulkActionButtons={false}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'asnId', 'poDetlId', 'platItemId', 'poDetlCode', 'matnrId', 'purQty', 'splrName', 'purUnit', 'qrcode', 'packName', 'trackCode']}
                    omit={['id', 'orderId', 'poDetlId', 'platItemId', 'poDetlCode', 'matnrId', 'purQty', 'splrName', 'purUnit', 'qrcode', 'packName', 'trackCode']}
                >
                    {columns.map((column) => column)}
                </StyledDatagrid>}

 rsf-admin/src/page/orders/check/CheckOrderItemCreate.jsx

@@ -87,15 +87,15 @@
                            <Grid>
                                <Grid item xs={6} display="flex" gap={2}>
                                    <NumberInput
                                        label="table.field.outStockItem.asnId"
                                        source="asnId"
                                        label="table.field.outStockItem.orderId"
                                        source="orderId"
                                        readOnly
                                        hidden
                                        defaultValue={record?.id}
                                    />
                                    <TextInput
                                        label="table.field.outStockItem.asnCode"
                                        source="asnCode"
                                        label="table.field.outStockItem.orderCode"
                                        source="orderCode"
                                        readOnly
                                        defaultValue={record?.code}
                                        parse={v => v}

 rsf-admin/src/page/orders/check/CheckOrderItemList.jsx

@@ -58,8 +58,8 @@

const filters = [
  <SearchInput source="condition" alwaysOn />,
  <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn />,
  <NumberInput source="orderId" label="table.field.outStockItem.orderId" />,
  <TextInput source="orderCode" label="table.field.outStockItem.orderCode" alwaysOn />,
  <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
  <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
  <TextInput source="maktx" label="table.field.outStockItem.maktx" alwaysOn />,
@@ -111,7 +111,7 @@
          }}
          title={"menu.outStockItem"}
          empty={false}
          filter={{ asnId: asnId, deleted: 0 }}
          filter={{ orderId: asnId, deleted: 0 }}
          filters={filters}
          sort={{ field: "create_time", order: "desc" }}
          actions={(
@@ -126,11 +126,11 @@
            preferenceKey='outStockItem'
            bulkActionButtons={false}
            rowClick={false}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty',  'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'asnId']}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty',  'trackCode', 'packName', 'qrcode', 'splrName', 'matnrId', 'orderId']}
          >
            <NumberField source="id" />
            <NumberField source="asnId" label="table.field.outStockItem.asnId" />
            <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
            <NumberField source="orderId" label="table.field.outStockItem.orderId" />
            <TextField source="orderCode" label="table.field.outStockItem.orderCode" />
            <TextField source="matnrId" label="table.field.outStockItem.matnrId" />
            <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
            <TextField source="maktx" label="table.field.outStockItem.maktx" />

 rsf-admin/src/page/orders/check/CheckOrderPub.jsx

@@ -188,7 +188,7 @@
                                }}
                                title={"menu.outStockItem"}
                                empty={false}
                                filter={{ asnId: record?.id, deleted: 0 }}
                                filter={{ orderId: record?.id, deleted: 0 }}
                                sort={{ field: "create_time", order: "desc" }}
                                actions={false}
                                pagination={false}
@@ -241,7 +241,7 @@
                    </Grid>
                </Grid>
                <Grid>
                    <CheckOrderSiteDialog
                    <OutStockSiteDialog
                        selectedValue={selectedValue}
                        open={dialog}
                        onClose={handleClose}

 rsf-admin/src/page/orders/check/SelectMatnrModal.jsx

@@ -174,7 +174,7 @@
    }

    const requestGetBody = async () => {
        const res = await request.post(`/checkItem/page`, { asnId });
        const res = await request.post(`/checkItem/page`, { orderId: asnId });
        if (res?.data?.code === 200) {
            setTableData(res.data.data.records)
        } else {

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

@@ -85,15 +85,15 @@
                            <Grid>
                                <Grid item xs={6} display="flex" gap={2}>
                                    <NumberInput
                                        label="table.field.outStockItem.asnId"
                                        source="asnId"
                                        label="table.field.outStockItem.orderId"
                                        source="orderId"
                                        readOnly
                                        hidden
                                        defaultValue={record?.id}
                                    />
                                    <TextInput
                                        label="table.field.outStockItem.asnCode"
                                        source="asnCode"
                                        label="table.field.outStockItem.orderCode"
                                        source="orderCode"
                                        readOnly
                                        defaultValue={record?.code}
                                        parse={v => v}

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

@@ -93,13 +93,13 @@
                            <Grid item xs={24} md={14}>
                                <Stack direction='row' gap={2}>
                                    <NumberInput
                                        label="table.field.outStockItem.asnId"
                                        source="asnId"
                                        label="table.field.outStockItem.orderId"
                                        source="orderId"
                                        readOnly
                                    />
                                    <TextInput
                                        label="table.field.outStockItem.asnCode"
                                        source="asnCode"
                                        label="table.field.outStockItem.orderCode"
                                        source="orderCode"
                                        readOnly
                                        parse={v => v}
                                    />

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

@@ -65,8 +65,8 @@

const filters = [
  <SearchInput source="condition" alwaysOn />,
  <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn />,
  <NumberInput source="orderId" label="table.field.outStockItem.orderId" />,
  <TextInput source="orderCode" label="table.field.outStockItem.orderCode" alwaysOn />,
  <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
  <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
  <TextInput source="maktx" label="table.field.outStockItem.maktx" alwaysOn />,
@@ -118,7 +118,7 @@
          }}
          title={"menu.outStockItem"}
          empty={false}
          filter={{ asnId: asnId, deleted: 0 }}
          filter={{ orderId: asnId, deleted: 0 }}
          filters={filters}
          sort={{ field: "create_time", order: "desc" }}
          actions={(
@@ -133,11 +133,11 @@
            preferenceKey='outStockItem'
            bulkActionButtons={false}
            rowClick={false}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'asnId','platOrderCode']}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'orderId','platOrderCode']}
          >
            <NumberField source="id" />
            <NumberField source="asnId" label="table.field.outStockItem.asnId" />
            <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
            <NumberField source="orderId" label="table.field.outStockItem.orderId" />
            <TextField source="orderCode" label="table.field.outStockItem.orderCode" />
            <TextField source="poCode" label="table.field.outStockItem.poCode" />
            <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />
            <TextField source="matnrId" label="table.field.outStockItem.matnrId" />

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

@@ -188,7 +188,7 @@
                                }}
                                title={"menu.outStockItem"}
                                empty={false}
                                filter={{ asnId: record?.id, deleted: 0 }}
                                filter={{ orderId: record?.id, deleted: 0 }}
                                sort={{ field: "create_time", order: "desc" }}
                                actions={false}
                                pagination={false}

 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml

@@ -9,8 +9,8 @@
            (
                SELECT
                    aoi.id,
                    aoi.asn_id,
                    aoi.asn_code,
                    aoi.order_id,
                    aoi.order_code,
                    aoi.plat_item_id,
                    aoi.po_detl_id,
                    aoi.plat_order_code,
@@ -78,8 +78,8 @@
            (
                SELECT
                    aoi.id,
                    aoi.asn_id,
                    aoi.asn_code,
                    aoi.order_id,
                    aoi.order_code,
                    aoi.plat_item_id,
                    aoi.plat_work_code,
                    aoi.po_detl_id,