From fb98f31695ffbd2129335870913195d37d44ab96 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 13:59:01 +0800
Subject: [PATCH] lsh#
---
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx | 2 +
rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx | 10 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java | 7 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 2 +
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx | 12 ++++++
rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx | 12 ++++++
rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx | 12 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 6 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 4 +-
rsf-admin/src/page/waitPakin/SelectSiteModel.jsx | 2 +
rsf-admin/src/i18n/zh.js | 2 +
rsf-admin/src/i18n/en.js | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 2
13 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 937d155..829f844 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -944,6 +944,8 @@
deviceSite: "deviceSite",
flagInit: "flagInit",
channel: "channel",
+ areaIdStart: "areaIdStart",
+ areaIdEnd: "areaIdEnd",
},
waitPakin: {
code: "code",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 41c7cda..1b7cc97 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -990,6 +990,8 @@
flagInit: "鏄惁鍒濆鍖�",
wcsCode: "wcs缂栧彿",
channel: "宸烽亾",
+ areaIdStart: "璧风偣搴撳尯",
+ areaIdEnd: "鐩爣搴撳尯",
},
waitPakin: {
code: "缂栫爜",
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx
index d2bf4c0..2db59d7 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx
@@ -144,6 +144,18 @@
parse={v => v}
/>
</Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.deviceSite.areaIdStart"
+ source="areaIdStart"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.deviceSite.areaIdEnd"
+ source="areaIdEnd"
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
index 13241e2..d077e67 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx
@@ -127,6 +127,18 @@
parse={v => v}
/>
</Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.deviceSite.areaIdStart"
+ source="areaIdStart"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.deviceSite.areaIdEnd"
+ source="areaIdEnd"
+ />
+ </Stack>
</Grid>
<Grid item xs={12} md={4}>
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
index 3a7cdf1..c30ee51 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx
@@ -72,6 +72,8 @@
<TextInput source="device" label="table.field.deviceSite.device" />,
<TextInput source="deviceCode" label="table.field.deviceSite.deviceCode" />,
<TextInput source="deviceSite" label="table.field.deviceSite.deviceSite" />,
+ <NumberInput source="deviceSite" label="table.field.deviceSite.areaIdStart" />,
+ <NumberInput source="deviceSite" label="table.field.deviceSite.areaIdEnd" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx
index 5f1e5a9..54be972 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx
@@ -88,6 +88,18 @@
property={record.deviceSite}
/>
</Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title={translate('table.field.deviceSite.areaIdStart')}
+ property={record.areaIdStart}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title={translate('table.field.deviceSite.areaIdEnd')}
+ property={record.areaIdEnd}
+ />
+ </Grid>
</Grid>
</CardContent>
diff --git a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
index 84b7a4f..a1417ed 100644
--- a/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx
@@ -159,6 +159,16 @@
// type="number"
/>
</Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="areaIdStart" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
+ <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdStart')} />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="areaIdEnd" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
+ <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdEnd')} />
+ </ReferenceInput>
+ </Grid>
<Grid item xs={4}>
<SelectInput
label="table.field.deviceSite.flagInit"
diff --git a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
index cb61972..5dba141 100644
--- a/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
+++ b/rsf-admin/src/page/waitPakin/SelectSiteModel.jsx
@@ -107,6 +107,8 @@
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <NumberField source="deviceSite" label="table.field.deviceSite.areaIdStart" />,
+ <NumberField source="deviceSite" label="table.field.deviceSite.areaIdEnd" />,
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<SelectSiteButton source={source} setOpen={setOpen} refresh={refresh} notify={notify} />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
index 45e687e..7276400 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
@@ -34,4 +34,11 @@
@ApiModelProperty("宸烽亾")
private Integer channel;
+ @ApiModelProperty("婧愬簱鍖�")
+ private Long areaIdStart;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ private Long areaIdEnd;
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index b11a951..c5054c8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -156,6 +156,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty("婧愬簱鍖�")
+ private Long areaIdStart;
+
+ @ApiModelProperty("鐩爣搴撳尯")
+ private Long areaIdEnd;
+
public DeviceSite() {}
public DeviceSite(String type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index d148b04..ff6d644 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -14,7 +14,7 @@
R generateFlatWarehouseTasks(WaitPakin waitPakins, String locCode, Long loginUserId);
- R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, Long loginUserId);
+ R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, String targSite, Long loginUserId);
void completeTask(List<Task> task) throws Exception;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
index ac8e42a..73aa5a7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
@@ -75,6 +75,8 @@
.setDeviceSite(basStation2.getStationName())
.setTarget(target)
.setDeviceCode(param.getDeviceCode())
+ .setAreaIdStart(param.getAreaIdStart())
+ .setAreaIdEnd(param.getAreaIdEnd())
.setChannel(param.getChannel())
;
deviceSites.add(site1);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 235ab27..95ba5eb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -125,7 +125,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {
+ public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta,String targSite, Long loginUserId) {
if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -154,7 +154,7 @@
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
.setTargLoc(targetLoc)
- .setTargSite(orgSta)
+ .setTargSite(targSite)
.setOrgSite(orgSta)
.setBarcode(pakin.getBarcode())
.setCreateBy(loginUserId)
--
Gitblit v1.9.1