From 6166b702c4cf716302e44cc118bc8e5fc8e909b3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 16:11:18 +0800
Subject: [PATCH] 问题修复及优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 769e868..9c7b6cc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
+import com.vincent.rsf.server.manager.controller.dto.LocUsageDto;
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.*;
@@ -40,6 +44,8 @@
@Autowired
private LocTypeRelaMapper locTypeRelaMapper;
+ @Autowired
+ private LocService locService;
@Override
public R modifyLocs(LocModifyParams locs) {
@@ -109,7 +115,7 @@
Integer chanl = 0; //榛樿绗竴宸烽亾
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
try{
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getChannel(),param.getStartRow());
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getChannel(), param.getStartRow());
for (List<Integer> node : shelves.nodes){
if (node.contains(r)) {
if (!Cools.isEmpty(param.getStartChannel()) && param.getStartChannel() > 0){
@@ -217,4 +223,25 @@
return R.ok();
}
+
+ /**
+ * 鑾峰彇搴撲綅浣跨敤鎯呭喌
+ * @return
+ */
+ @Override
+ public R getLocPies() {
+ List<LocUsageDto> locPies = this.baseMapper.getLocPies();
+ return R.ok().add(locPies);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/16
+ * @description: 鑾峰彇搴撲綅鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public IPage<LocStockDto> getLocDetls(Page<Object> page) {
+ return this.baseMapper.getLocDetls(page);
+ }
}
--
Gitblit v1.9.1