From 51e9b24c421dd2e77ec5809a62c35fec115d5876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:12:02 +0800
Subject: [PATCH] #添加 1. 添加库位逻辑分区 2. 物料添加自动生成编码 3. 库区字段显示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 ca97031..c992c2d 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
@@ -17,7 +17,9 @@
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;
+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 io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -77,15 +79,17 @@
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);
-
+ if (Objects.isNull(matnr1.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
+ System.out.println("=========>");
+ System.out.println(ruleCode);
+ matnr1.setCode(ruleCode);
+ }
/**
* 鎵╁睍瀛楁瀛樺叆搴�
*/
@@ -109,8 +113,13 @@
@PostMapping("/matnr/update")
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Map<String, Object> params) {
-
Matnr matnr = JSONObject.parseObject(JSONObject.toJSONString(params), Matnr.class);
+ if (Objects.isNull(matnr.getCode())) {
+ throw new CoolException("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(matnr.getName())) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
matnr.setUpdateBy(getLoginUserId());
if (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
--
Gitblit v1.9.1