From 85973ffba77aeff71f2dbd588c7fb81f89148fdc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 18 二月 2025 08:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/matnr/MatnrEdit.jsx | 8 ----
rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx | 6 ---
rsf-admin/src/page/matnr/MatnrList.jsx | 2 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 12 +----
rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx | 8 ----
rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx | 9 ----
rsf-admin/src/page/matnr/MatnrCreate.jsx | 8 ----
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 9 ----
rsf-admin/src/page/matnr/MatnrPanel.jsx | 6 ---
rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx | 2 -
rsf-server/src/main/resources/application.yml | 2
rsf-admin/.env | 2
rsf-server/src/main/resources/application-dev.yml | 4 -
13 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index 57761ad..0abf3df 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,2 +1,2 @@
-VITE_BASE_IP=192.168.4.179
+VITE_BASE_IP=localhost
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/matnr/MatnrCreate.jsx
index 1c09682..ba9f72a 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/matnr/MatnrEdit.jsx b/rsf-admin/src/page/matnr/MatnrEdit.jsx
index 12a61f2..7c85bda 100644
--- a/rsf-admin/src/page/matnr/MatnrEdit.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index fd4ef7b..a2abf5a 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/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>
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/matnr/MatnrPanel.jsx
index ead25e8..434ce30 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/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$}
/>
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx b/rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx
index a6f572a..3344309 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupCreate.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx
index d1e5ae5..8240f0c 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupEdit.jsx
+++ b/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}
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx b/rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx
index e103c74..7a34054 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupList.jsx
+++ b/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" />
diff --git a/rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx b/rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx
index 20ca0d4..f704804 100644
--- a/rsf-admin/src/page/matnrGroup/MatnrGroupPanel.jsx
+++ b/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}
/>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 4d61ab1..14b9743 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/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;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index 5800467..b97c928 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/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;
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 0ab8ed2..bc61f8f 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/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
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index ee5cf27..5498f63 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/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:
--
Gitblit v1.9.1