From 4cc644945bda98e1ec30828944796ce2fb96e698 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 07:58:59 +0800
Subject: [PATCH] #修改 1. 逻辑分区绑定 2. 物料代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 32 ++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 26 +-----------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java | 1
5 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
index 52b8c9f..33bf873 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
@@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-@Api(tags = "閫昏緫鍒嗗尯")
@RestController
public class LocAreaController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
index dd5e155..8f9e08b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaRelaController.java
@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.LocAreaRela;
import com.vincent.rsf.server.manager.service.LocAreaRelaService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+
+@Api(tags = "閫昏緫鍒嗗尯")
@RestController
public class LocAreaRelaController extends BaseController {
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 c3d426d..098d840 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
@@ -82,30 +82,10 @@
if (Objects.isNull(matnr.get("groupId"))) {
throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
}
+ matnr.put("createBy", getLoginUserId());
+ matnr.put("updateBy", getLoginUserId());
+ return matnrService.saveMatnrs(matnr);
- Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
- if (Objects.isNull(matnr1.getCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
- System.out.println("=========>");
- System.out.println(ruleCode);
- matnr1.setCode(ruleCode);
- }
- /**
- * 鎵╁睍瀛楁瀛樺叆搴�
- */
- 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);
}
@PreAuthorize("hasAuthority('manager:matnr:update')")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
index cede4af..038a93b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
@@ -7,9 +7,13 @@
import com.vincent.rsf.server.manager.entity.Matnr;
import org.springframework.web.multipart.MultipartFile;
+import java.util.Map;
+
public interface MatnrService extends IService<Matnr> {
R importExcels(MultipartFile file) throws Exception;
PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam);
+
+ R saveMatnrs(Map<String, Object> matnr);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 30f9f74..8985b97 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -2,6 +2,7 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.common.SpringUtils;
@@ -18,8 +19,10 @@
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -108,4 +111,33 @@
page.setRecords(records);
return page;
}
+
+ /**
+ * @desc 鏇存柊鎵╁睍鐗╂枡鎵╁睍瀛楁鍊�
+ * @param matnr
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveMatnrs(Map<String, Object> matnr) {
+ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
+ if (Objects.isNull(matnr1.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
+ System.out.println("=========>");
+ System.out.println(ruleCode);
+ matnr1.setCode(ruleCode);
+ }
+ /**
+ * 鎵╁睍瀛楁瀛樺叆搴�
+ */
+ String uuid16 = CommonUtil.randomUUID16();
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ FieldsUtils.saveFields(matnr, uuid16);
+ matnr1.setFieldsIndex(uuid16);
+ }
+ if (!this.save(matnr1)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("淇濆瓨鎴愬姛!!");
+ }
}
--
Gitblit v1.9.1