From fa924875ed3f2a8601ce04b7a65e53bc60b81091 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 十二月 2025 13:02:08 +0800
Subject: [PATCH] *
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 2 +-
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index ecf1a27..292d1a1 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -127,6 +127,23 @@
source="height"
/>
</Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ validate={[required()]}
+ parse={v => v}
+ />
+ </Stack>
</Grid>
</Grid>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index 264d337..ec0beb1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -82,7 +82,7 @@
basContainer.setCreateTime(new Date());
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
- BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()));
+ BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()).orderByDesc(BasContainer::getId),false);
if (null != container) {
return R.error("璇ョ被鍨嬪凡琚垵濮嬪寲");
}
--
Gitblit v1.9.1