From 6f3f068606f1f18ce859def1b6960571fd742605 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 20 三月 2025 08:59:19 +0800
Subject: [PATCH] #新增 1. 物料保存扩展字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 cc0980a..12ed36f 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;
@@ -66,20 +69,33 @@
@PreAuthorize("hasAuthority('manager:matnr:save')")
@OperationLog("Create 鐗╂枡淇℃伅琛�")
@PostMapping("/matnr/save")
- public R save(@RequestBody Matnr matnr) {
- if (Objects.isNull(matnr.getName())) {
+ 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.getCode())) {
+ if (Objects.isNull(matnr.get("code"))) {
throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(matnr.getGroupId())) {
+ if (Objects.isNull(matnr.get("groupId"))) {
throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
}
- matnr.setCreateBy(getLoginUserId());
- matnr.setUpdateBy(getLoginUserId());
- if (!matnrService.save(matnr)) {
+ /**
+ * 鎵╁睍瀛楁瀛樺叆搴�
+ */
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ String uuid16 = CommonUtil.randomUUID16();
+ FieldsUtils.saveFields(matnr, uuid16);
+ }
+
+ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
+ matnr1.setCreateBy(getLoginUserId());
+ matnr1.setUpdateBy(getLoginUserId());
+
+ if (!matnrService.save(matnr1)) {
return R.error("Save Fail");
}
return R.ok("Save Success").add(matnr);
--
Gitblit v1.9.1