From 158ef0f443b9f36f8beb44853ed1f39449c45c1d Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 10:55:37 +0800
Subject: [PATCH] #修改 1. 动态扩展字段优化 2. 物料优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
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 83cadf6..2521ad4 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
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -18,8 +19,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -65,10 +68,26 @@
@OperationLog("Create 搴撲綅淇℃伅琛�")
@PostMapping("/loc/save")
public R save(@RequestBody Loc loc) {
+ if (Objects.isNull(loc.getWarehouseId())) {
+ throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(loc.getAreaId())) {
+ throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(loc.getTypeIds())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ String join = StringUtils.join(loc.getTypeIds(), ",");
+ loc.setType(join);
+
loc.setCreateBy(getLoginUserId());
loc.setUpdateBy(getLoginUserId());
if (!locService.save(loc)) {
return R.error("Save Fail");
+ }
+
+ if (!locService.saveType(loc)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
return R.ok("Save Success").add(loc);
}
@@ -76,12 +95,20 @@
@PreAuthorize("hasAuthority('manager:loc:update')")
@OperationLog("Update 搴撲綅淇℃伅琛�")
@PostMapping("/loc/update")
+ @Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
+
+ String join = StringUtils.join(loc.getTypeIds(), ",");
+ loc.setType(join);
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
+
+ if (!locService.updateLoc(loc)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
+ }
return R.ok("Update Success").add(loc);
}
--
Gitblit v1.9.1