From 9e27b1b292872bd83b761091554fbd8db72b595e Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 20 三月 2025 10:47:13 +0800
Subject: [PATCH] #优化 物料扩展字段修改优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 3a6d4e2..ca97031 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -1,16 +1,19 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.domain.PageResult;
+import com.vincent.rsf.server.common.utils.CommonUtil;
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.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
@@ -21,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,7 +45,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add(matnrService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add( matnrService.getMatnrPage(pageParam));
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -56,6 +60,7 @@
return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
}
+
@PreAuthorize("hasAuthority('manager:matnr:list')")
@GetMapping("/matnr/{id}")
public R get(@PathVariable("id") Long id) {
@@ -65,12 +70,35 @@
@PreAuthorize("hasAuthority('manager:matnr:save')")
@OperationLog("Create 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/save")
- public R save(@RequestBody Matnr matnr) {
- matnr.setCreateBy(getLoginUserId());
- matnr.setCreateTime(new Date());
- matnr.setUpdateBy(getLoginUserId());
- matnr.setUpdateTime(new Date());
- if (!matnrService.save(matnr)) {
+ public R save(@RequestBody Map<String, Object> matnr) {
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.get("matnr"))) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.get("code"))) {
+ throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.get("groupId"))) {
+ throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
+ }
+
+ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
+
+ /**
+ * 鎵╁睍瀛楁瀛樺叆搴�
+ */
+ String uuid16 = CommonUtil.randomUUID16();
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ FieldsUtils.saveFields(matnr, uuid16);
+ matnr1.setFieldsIndex(uuid16);
+ }
+
+ matnr1.setCreateBy(getLoginUserId());
+ matnr1.setUpdateBy(getLoginUserId());
+
+ if (!matnrService.save(matnr1)) {
return R.error("Save Fail");
}
return R.ok("Save Success").add(matnr);
@@ -79,11 +107,16 @@
@PreAuthorize("hasAuthority('manager:matnr:update')")
@OperationLog("Update 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/update")
- public R update(@RequestBody Matnr matnr) {
+ @Transactional(rollbackFor = Exception.class)
+ public R update(@RequestBody Map<String, Object> params) {
+
+ Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
matnr.setUpdateBy(getLoginUserId());
- matnr.setUpdateTime(new Date());
if (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
+ }
+ if (!Objects.isNull(params.get("fieldsIndex"))) {
+ FieldsUtils.updateFieldsValue(params);
}
return R.ok("Update Success").add(matnr);
}
@@ -140,7 +173,7 @@
} else {
matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
}
- ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
--
Gitblit v1.9.1