From 635af3620fa28181b168af34f831401c5fd5277d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 08:27:51 +0800
Subject: [PATCH] lsh#
---
rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx | 9 +++++++++
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java | 1 +
rsf-admin/src/i18n/zh.js | 3 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 8 +++++++-
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx | 8 ++++++++
7 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index d466567..cc8b7ec 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -237,6 +237,7 @@
},
basStation: {
stationName: 'stationName',
+ stationId: 'stationId',
inAble: 'inAble',
outAble: 'outAble',
type: 'Site Type',
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 15cc0c9..d465106 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -265,7 +265,8 @@
areas: '鍙叆搴撳尯',
},
basStation: {
- stationName: '绔欑偣鍚嶇О',
+ stationName: '绔欑偣缂栧彿',
+ stationId: '绔欑偣鍚嶇О',
type: '绔欑偣绫诲瀷',
inAble: '鑳藉叆',
outAble: '鑳藉嚭',
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
index 5341c65..75bd7a8 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
@@ -97,6 +97,15 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.basStation.stationId"
+ source="stationId"
+ parse={v => v}
+ autoFocus
+ validate={[required()]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.basStation.type"
source="type"
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
index 2c2b12e..b50f57c 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
@@ -75,6 +75,14 @@
/>
</Stack>
<Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.basStation.stationId"
+ source="stationId"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
<SelectInput
label="table.field.basStation.type"
source="type"
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 6370340..8b9e6dd 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -68,6 +68,7 @@
<DateInput label='common.time.before' source="timeEnd" />,
<TextInput source="stationName" label="table.field.basStation.stationName" alwaysOn />,
+ <TextInput source="stationId" label="table.field.basStation.stationId" alwaysOn />,
<NumberInput source="inAble" label="table.field.basStation.inAble" />,
<NumberInput source="outAble" label="table.field.basStation.outAble" />,
<TextInput source="useStatus" label="table.field.basStation.useStatus" />,
@@ -134,6 +135,7 @@
<NumberField source="id" />
<TextField source="type$" label="table.field.basStation.type" />
<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
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index af2aaf9..d0676f0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -41,9 +41,15 @@
/**
* 绔欑偣鍚嶇О
*/
- @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ @ApiModelProperty(value = "绔欑偣缂栧彿")
private String stationName;
+ /**
+ * 绔欑偣鍚嶇О
+ */
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ private String stationId;
+
@ApiModelProperty("绔欑偣绫诲瀷: {0:鍏夌數锛� 1:鏃犲厜鐢祡")
private Integer type;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
index ebe4b45..012888b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java
@@ -70,5 +70,6 @@
@Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void complateOutStock() throws Exception {
+ System.out.println("缂撳瓨鍖哄煙鑷姩鐢熸垚绌鸿揣鏋跺嚭搴撲换鍔�");
}
}
--
Gitblit v1.9.1