From b69d8253dbf8b29bca1ac5f6cf1f305e5e188f0a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 12 三月 2026 15:33:46 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 108539b..7acbc81 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,7 +5,7 @@
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.api.utils.LocUtils;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -14,7 +14,10 @@
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.Companys;
import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.enums.TaskResouceType;
+import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -34,6 +37,8 @@
private LocItemService locItemService;
@Autowired
private LocService locService;
+ @Autowired
+ private CompanysService companysService;
@PreAuthorize("hasAuthority('manager:locItem:list')")
@PostMapping("/locItem/page")
@@ -77,6 +82,12 @@
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
}
+ if (record.getSplrId() != null) {
+ Companys companys = companysService.getById(record.getSplrId());
+ if (companys != null) {
+ record.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ }
+ }
}
page.setRecords(records);
@@ -98,7 +109,7 @@
param.setType(Constants.TASK_TYPE_OUT_STOCK);
try {
- locItemService.generateTask(param, getLoginUserId());
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -136,7 +147,9 @@
map.setType(Constants.TASK_TYPE_OUT_CHECK);
try {
- locItemService.generateTask(map, getLoginUserId());
+ locItemService.generateTask(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val, map, getLoginUserId());
+ } catch (CoolException e) {
+ throw e;
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -160,7 +173,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