From 8d5c50656d81dc3eb04a841ecd259adebf99424a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 15:49:26 +0800
Subject: [PATCH] 搜索库存明细调整不查询删除物料
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 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 5390de7..ccbde80 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
@@ -5,17 +5,24 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
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;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.manager.enums.LocStsType;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -28,20 +35,41 @@
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:locItem:list')")
@PostMapping("/locItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
+ // 搴撲綅鐘舵�佺瓫閫夛細鍏宠仈 man_loc锛屼笉鑳戒綔涓� man_loc_item 瀛楁鍙備笌 buildWrapper
+ Object useStatus = map.get("useStatus");
+ if (pageParam.getWhere() != null && pageParam.getWhere().getMap() != null) {
+ pageParam.getWhere().getMap().remove("useStatus");
+ }
+ QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(true);
+ if (useStatus != null && StringUtils.isNotBlank(useStatus.toString())) {
+ String status = useStatus.toString().replace("'", "''");
+ wrapper.apply("EXISTS (SELECT 1 FROM man_loc ml WHERE ml.id = man_loc_item.loc_id AND ml.use_status = '" + status + "')");
+ }
+ 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);
@@ -71,6 +99,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);
@@ -79,17 +114,25 @@
/**
* 鐢熸垚搴撳瓨鍑哄簱浠诲姟
- * @param map
+ * @param param
* @return
*/
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚搴撳瓨鍑哄簱浠诲姟")
@PostMapping("/locItem/generate/task")
- public R generateTask(@RequestBody Map<String, Object> map) {
- if (Objects.isNull(map)) {
+ public R generateTask(@RequestBody LocToTaskParams param) {
+ if (Objects.isNull(param)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.generateTask(map);
+ param.setType(Constants.TASK_TYPE_OUT_STOCK);
+
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok();
}
/**
@@ -100,11 +143,11 @@
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚绉诲簱浠诲姟")
@PostMapping("/locItem/move/task")
- public R genMoveTask(@RequestBody Map<String, Object> map) {
+ public R genMoveTask(@RequestBody LocToTaskParams map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.genMoveTask(map);
+ return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map, getLoginUserId()));
}
/**
@@ -115,11 +158,19 @@
@PreAuthorize("hasAuthority('manager:locItem:list')")
@ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
@PostMapping("/locItem/check/task")
- public R genStatisticalTask(@RequestBody Map<String, Object> map) {
+ public R genStatisticalTask(@RequestBody LocToTaskParams map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return locItemService.generateTask(map);
+ map.setType(Constants.TASK_TYPE_OUT_CHECK);
+
+ try {
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val, map, getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return R.ok("浠诲姟鐢熸垚鎴愬姛");
}
--
Gitblit v1.9.1