From 706319efad928f4df75507956a30ad95f50befee Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 26 十一月 2025 13:12:07 +0800
Subject: [PATCH] 库存信息添加动态字段查询功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 9d1717e..fc8bddd 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
@@ -14,6 +14,8 @@
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
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;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -40,8 +42,11 @@
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())) {
@@ -96,7 +101,13 @@
}
param.setType(Constants.TASK_TYPE_OUT_STOCK);
- return locItemService.generateTask(param);
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok();
}
/**
@@ -111,7 +122,7 @@
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map));
+ return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map, getLoginUserId()));
}
/**
@@ -127,7 +138,14 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
map.setType(Constants.TASK_TYPE_OUT_CHECK);
- return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.generateTask(map));
+
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val, map, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok("浠诲姟鐢熸垚鎴愬姛");
}
@@ -146,7 +164,7 @@
@PreAuthorize("hasAuthority('manager:locItem:list')")
@GetMapping("/locItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locService.getById(id));
+ return R.ok().add(locItemService.getById(id));
}
@PreAuthorize("hasAuthority('manager:locItem:save')")
--
Gitblit v1.9.1