From 2e7e4493e133b9b646da9cd2d635287f14509e4c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 25 三月 2025 11:22:54 +0800 Subject: [PATCH] 修改 # 库位初始化修改 --- rsf-server/pom.xml | 13 ++++++++++++- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 8 +++----- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java | 4 +--- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/rsf-server/pom.xml b/rsf-server/pom.xml index 2c67954..86be1e6 100644 --- a/rsf-server/pom.xml +++ b/rsf-server/pom.xml @@ -155,7 +155,18 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <encoding>UTF-8</encoding> + <nonFilteredFileExtensions> + <nonFilteredFileExtension>xls</nonFilteredFileExtension> + <nonFilteredFileExtension>xlsx</nonFilteredFileExtension> + <nonFilteredFileExtension>zip</nonFilteredFileExtension> + </nonFilteredFileExtensions> + </configuration> + </plugin> </plugins> </build> - </project> diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java index 79d69c6..3a91dc6 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java @@ -206,7 +206,7 @@ if (Objects.isNull(param.getEndLev())) { return R.error("缁堟灞備笉鑳戒负绌猴紒锛�"); } - return locService.initLocs(param); + return locService.initLocs(param, getLoginUserId()); } } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java index 839bac3..9b936bc 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java @@ -6,13 +6,11 @@ import com.vincent.rsf.server.manager.controller.params.LocModifyParams; import com.vincent.rsf.server.manager.entity.Loc; -import java.util.List; - public interface LocService extends IService<Loc> { R modifyLocs(LocModifyParams locs); - R initLocs(LocMastInitParam param); + R initLocs(LocMastInitParam param, Long loginUserId); boolean saveType(Loc typeIds); 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 63d4d69..c0ae701 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 @@ -1,6 +1,5 @@ package com.vincent.rsf.server.manager.service.impl; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.R; @@ -16,13 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; @Service("locService") public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService { @@ -75,7 +71,7 @@ @Override @Transactional(rollbackFor = Exception.class) - public R initLocs(LocMastInitParam param) { + public R initLocs(LocMastInitParam param, Long loginUserId) { //娓呯┖琛� this.baseMapper.deleteAll(); @@ -101,6 +97,8 @@ .setLev(l) .setType(join) .setAreaId(param.getAreaId()) + .setUpdateBy(loginUserId) + .setCreateBy(loginUserId) .setWarehouseId(warehouseAreas.getWarehouseId()); list.add(loc); } -- Gitblit v1.9.1