From bb7dd1f513149ecd2887895c807861fdd06a43f6 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 15:29:27 +0800
Subject: [PATCH] 展示库存明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index 638612a..2fb3cbe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -13,7 +13,9 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.entity.ViewStockManage;
import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
@@ -41,13 +43,24 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
+ QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(true);
+ FieldsUtils.setFieldsFilters(wrapper, pageParam, LocItem.class);
+
/**鎷兼帴鎵╁睍瀛楁*/
- PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, pageParam.buildWrapper(true));
+ PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, wrapper);
List<LocItem> records = page.getRecords();
for (LocItem record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
+ }
+ // 濉厖搴撲綅鐘舵�侊紝渚夸簬鍒楄〃灞曠ず
+ if (record.getLocId() != null) {
+ Loc loc = locService.getById(record.getLocId());
+ if (loc != null) {
+ record.setLocUseStatus(loc.getUseStatus());
+ record.setLocUseStatus$(loc.getUseStatus$());
+ }
}
}
page.setRecords(records);
@@ -77,6 +90,13 @@
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
}
+ if (record.getLocId() != null) {
+ Loc loc = locService.getById(record.getLocId());
+ if (loc != null) {
+ record.setLocUseStatus(loc.getUseStatus());
+ record.setLocUseStatus$(loc.getUseStatus$());
+ }
+ }
}
page.setRecords(records);
--
Gitblit v1.9.1