Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-18 85973ffba77aeff71f2dbd588c7fb81f89148fdc

Merge remote-tracking branch 'origin/dev' into dev

 rsf-admin/.env

@@ -1,2 +1,2 @@
VITE_BASE_IP=192.168.4.179
VITE_BASE_IP=localhost
VITE_BASE_PORT=8080

 rsf-admin/src/page/matnr/MatnrCreate.jsx

@@ -85,14 +85,6 @@
                        <DialogContent sx={{ mt: 2 }}>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.matnr.uuid"
                                        source="uuid"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="shipperId"
                                        reference="shipper"

 rsf-admin/src/page/matnr/MatnrEdit.jsx

@@ -64,14 +64,6 @@
                            {translate('common.edit.title.main')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.matnr.uuid"
                                source="uuid"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <ReferenceInput
                                source="shipperId"
                                reference="shipper"

 rsf-admin/src/page/matnr/MatnrList.jsx

@@ -63,7 +63,6 @@
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="uuid" label="table.field.matnr.uuid" />,
    <ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
        <AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
@@ -149,7 +148,6 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.matnr.uuid" />
                    <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>

 rsf-admin/src/page/matnr/MatnrPanel.jsx

@@ -42,12 +42,6 @@
                    <Grid container spacing={2}>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.matnr.uuid" 
                                property={record.uuid}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.matnr.shipperId" 
                                property={record.shipperId$}
                            />

 rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx

@@ -84,14 +84,7 @@
                        </DialogTitle>
                        <DialogContent sx={{ mt: 2 }}>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.matnrGroup.uuid"
                                        source="uuid"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
    
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.matnrGroup.name"

 rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx

@@ -65,14 +65,6 @@
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.matnrGroup.uuid"
                                source="uuid"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.matnrGroup.name"
                                source="name"
                                parse={v => v}

 rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx

@@ -63,7 +63,6 @@
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="uuid" label="table.field.matnrGroup.uuid" />,
    <TextInput source="name" label="table.field.matnrGroup.name" />,
    <TextInput source="code" label="table.field.matnrGroup.code" />,
    <NumberInput source="parentId" label="table.field.matnrGroup.parentId" />,
@@ -120,7 +119,6 @@
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.matnrGroup.uuid" />
                    <TextField source="name" label="table.field.matnrGroup.name" />
                    <TextField source="code" label="table.field.matnrGroup.code" />
                    <NumberField source="parentId" label="table.field.matnrGroup.parentId" />

 rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx

@@ -42,12 +42,6 @@
                    <Grid container spacing={2}>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.matnrGroup.uuid" 
                                property={record.uuid}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.matnrGroup.name" 
                                property={record.name}
                            />

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java

@@ -36,11 +36,6 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 标识
     */
    @ApiModelProperty(value= "标识")
    private String uuid;

    /**
     * 货主ID
@@ -106,7 +101,7 @@
     * 描述
     */
    @ApiModelProperty(value= "描述")
    private String desc;
    private String describle;

    /**
     * 标包数量
@@ -197,8 +192,7 @@

    public Matnr() {}

    public Matnr(String uuid,Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String desc,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
    public Matnr(Long shipperId,String name,String code,Long groupId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.shipperId = shipperId;
        this.name = name;
        this.code = code;
@@ -209,7 +203,7 @@
        this.weight = weight;
        this.color = color;
        this.size = size;
        this.desc = desc;
        this.describle = describle;
        this.nromNum = nromNum;
        this.unit = unit;
        this.purchaseUnit = purchaseUnit;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java

@@ -35,12 +35,6 @@
    private Long id;

    /**
     * 标识
     */
    @ApiModelProperty(value= "标识")
    private String uuid;

    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
@@ -111,8 +105,7 @@

    public MatnrGroup() {}

    public MatnrGroup(String uuid,String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
    public MatnrGroup(String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.name = name;
        this.code = code;
        this.parentId = parentId;

 rsf-server/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
    static-path-pattern: /**
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 34821015
    type: com.alibaba.druid.pool.DruidDataSource
@@ -58,8 +58,6 @@
          timeout: 5000
          socketFactory:
            class: javax.net.ssl.SSLSocketFactory


redis:
  host: 127.0.0.1
  password: xltys1995

 rsf-server/src/main/resources/application.yml

@@ -23,7 +23,7 @@
  #  global-config:

  #    field-strategy: 0

  configuration:

    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

    map-underscore-to-camel-case: true

    cache-enabled: true

  global-config: