From 52795d13ae23ef9ef870eefe9da8e49e8526bba1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 14:42:04 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx | 7 +++----
rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx | 9 ++++-----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx b/rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx
index 101d8d4..c8e60f9 100644
--- a/rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx
+++ b/rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx
@@ -128,11 +128,10 @@
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.deviceBind.typeId"
- source="typeId"
- />
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
+ <AutocompleteInput optionValue="id" optionText="name" label="table.field.deviceBind.typeId" />
+ </ReferenceInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
diff --git a/rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx b/rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx
index 9bd771b..f93e7fd 100644
--- a/rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx
+++ b/rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx
@@ -108,10 +108,9 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.deviceBind.typeId"
- source="typeId"
- />
+ <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
+ <AutocompleteInput optionValue="id" optionText="name" label="table.field.deviceBind.typeId" />
+ </ReferenceInput>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 57b3e1f..295ccdf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -499,7 +499,7 @@
String shallowLoc = LocUtils.getDeepLoc(slaveProperties, locMast1.getCode());
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
- .eq(Loc::getUseStatus, "O")
+ .eq(Loc::getUseStatus, LocUseStatusType.Empty_Slot.type)
.eq(Loc::getAreaId,area)
);
if (!Cools.isEmpty(locMast2)) {
--
Gitblit v1.9.1