From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index e8d9a19..49cbae8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -4,15 +4,20 @@
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.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.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
+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.*;
@@ -57,10 +62,39 @@
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/companys/save")
public R save(@RequestBody Companys companys) {
+ if (Objects.isNull(companys.getName())) {
+ throw new CoolException("浼佷笟鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(companys.getBreifCode())) {
+ throw new CoolException("浼佷笟鍔╄鐮佷笉鑳戒负绌�!!");
+ }
+ if (Objects.isNull(companys.getType())) {
+ throw new CoolException("浼佷笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+
+ List<Companys> warehouses = companysService.list(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getName, companys.getName())
+ .eq(Companys::getType, companys.getType())
+ .eq(Companys::getBreifCode, companys.getBreifCode()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浼佷笟宸插瓨鍦紒锛�");
+ }
+ if (!companysService.list(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getType, companys.getType())
+ .eq(Companys::getName, companys.getName())
+ .eq(Companys::getCode, companys.getBreifCode())).isEmpty()) {
+ throw new CoolException("浼佷笟缂栫爜閲嶅锛侊紒");
+ }
+
companys.setCreateBy(getLoginUserId());
- companys.setCreateTime(new Date());
companys.setUpdateBy(getLoginUserId());
- companys.setUpdateTime(new Date());
+ if (StringUtils.isBlank(companys.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, companys);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_COMPANYS_CODE銆嶆槸鍚﹁缃畬鎴愶紒锛�");
+ }
+ companys.setCode(ruleCode);
+ }
if (!companysService.save(companys)) {
return R.error("Save Fail");
}
@@ -71,8 +105,17 @@
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/companys/update")
public R update(@RequestBody Companys companys) {
+ if (Objects.isNull(companys.getName())) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(companys.getBreifCode())) {
+ throw new CoolException("鍔╄鐮佷笉鑳戒负绌�!!");
+ }
+ if (Objects.isNull(companys.getType())) {
+ throw new CoolException("绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ companys.setUpdateTime(null);
companys.setUpdateBy(getLoginUserId());
- companys.setUpdateTime(new Date());
if (!companysService.updateById(companys)) {
return R.error("Update Fail");
}
@@ -106,7 +149,13 @@
@PreAuthorize("hasAuthority('manager:companys:list')")
@PostMapping("/companys/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(companysService.list(), Companys.class), response);
+ List<Companys> companies = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ companies = companysService.list(new LambdaQueryWrapper<Companys>().in(Companys::getId, map.get("ids")));
+ } else {
+ companies = companysService.list();
+ }
+ ExcelUtil.build(ExcelUtil.create(companies, Companys.class), response);
}
}
--
Gitblit v1.9.1