From 0b3cdb1e0c2f495edb971c585bd6b4b0456bf93a Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 14:55:34 +0800
Subject: [PATCH] 字段变更 增加类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 insertions(+), 0 deletions(-)
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 7f51d3f..e6d89f7 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
@@ -26,17 +26,22 @@
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
+@Slf4j
@Service("matnrService")
public class MatnrServiceImpl extends ServiceImpl<MatnrMapper, Matnr> implements MatnrService {
@@ -45,6 +50,126 @@
@Autowired
private FieldsService fieldsService;
+
+ @Override
+ public String normalizeMatnrBatchValue(String batch) {
+ return StringUtils.isBlank(batch) ? "" : batch.trim();
+ }
+
+ @Override
+ public Matnr getOneByCodeAndBatch(String code, String batchNullable) {
+ if (StringUtils.isBlank(code)) {
+ return null;
+ }
+ String nb = normalizeMatnrBatchValue(batchNullable);
+ return this.getOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, code.trim())
+ .eq(Matnr::getBatch, nb), false);
+ }
+
+ private void normalizeMatnrBatchOnEntity(Matnr entity) {
+ if (entity == null) {
+ return;
+ }
+ entity.setBatch(normalizeMatnrBatchValue(entity.getBatch()));
+ }
+
+ private void assertUniqueMatnr(Matnr entity) {
+ if (entity == null || StringUtils.isBlank(entity.getCode())) {
+ return;
+ }
+ normalizeMatnrBatchOnEntity(entity);
+ LambdaQueryWrapper<Matnr> w = new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, entity.getCode().trim())
+ .eq(Matnr::getBatch, entity.getBatch());
+ if (entity.getId() != null) {
+ w.ne(Matnr::getId, entity.getId());
+ }
+ if (this.count(w) > 0) {
+ String nb = entity.getBatch();
+ throw new CoolException(StringUtils.isBlank(nb)
+ ? "鐗╂枡缂栫爜宸插瓨鍦紙鏃犳壒娆★級锛�" + entity.getCode().trim()
+ : "鐗╂枡缂栫爜涓庢壒娆＄粍鍚堝凡瀛樺湪锛�" + entity.getCode().trim() + " / " + nb);
+ }
+ }
+
+ private void assertNoDuplicateMatnrKeysInList(List<Matnr> list) {
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+ Set<String> keys = new HashSet<>();
+ for (Matnr m : list) {
+ if (m == null || StringUtils.isBlank(m.getCode())) {
+ continue;
+ }
+ normalizeMatnrBatchOnEntity(m);
+ String key = m.getCode().trim() + "\u0000" + m.getBatch();
+ if (!keys.add(key)) {
+ throw new CoolException("瀵煎叆鏁版嵁涓墿鏂欑紪鐮佷笌鎵规閲嶅锛�" + m.getCode().trim()
+ + (StringUtils.isNotBlank(m.getBatch()) ? " / " + m.getBatch() : ""));
+ }
+ }
+ }
+
+ @Override
+ public boolean save(Matnr entity) {
+ normalizeMatnrBatchOnEntity(entity);
+ assertUniqueMatnr(entity);
+ return super.save(entity);
+ }
+
+ @Override
+ public boolean updateById(Matnr entity) {
+ normalizeMatnrBatchOnEntity(entity);
+ assertUniqueMatnr(entity);
+ return super.updateById(entity);
+ }
+
+ @Override
+ public boolean saveOrUpdate(Matnr entity) {
+ normalizeMatnrBatchOnEntity(entity);
+ assertUniqueMatnr(entity);
+ return super.saveOrUpdate(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveBatch(Collection<Matnr> entityList) {
+ if (entityList == null || entityList.isEmpty()) {
+ return true;
+ }
+ for (Matnr m : entityList) {
+ normalizeMatnrBatchOnEntity(m);
+ assertUniqueMatnr(m);
+ }
+ return super.saveBatch(entityList);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveBatch(Collection<Matnr> entityList, int batchSize) {
+ if (entityList == null || entityList.isEmpty()) {
+ return true;
+ }
+ for (Matnr m : entityList) {
+ normalizeMatnrBatchOnEntity(m);
+ assertUniqueMatnr(m);
+ }
+ return super.saveBatch(entityList, batchSize);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateBatch(Collection<Matnr> entityList, int batchSize) {
+ if (entityList == null || entityList.isEmpty()) {
+ return true;
+ }
+ for (Matnr m : entityList) {
+ normalizeMatnrBatchOnEntity(m);
+ assertUniqueMatnr(m);
+ }
+ return super.saveOrUpdateBatch(entityList, batchSize);
+ }
/**
* @return
@@ -67,6 +192,7 @@
* 鑾峰彇瀵煎叆鐗╂枡妯℃澘
*/
List<Matnr> matnrs = getMatnrTempletes(list);
+ assertNoDuplicateMatnrKeysInList(matnrs);
if (!this.saveBatch(matnrs)) {
throw new CoolException("瀵煎叆澶辫触锛侊紒");
@@ -86,6 +212,7 @@
Matnr matnr = new Matnr();
matnr.setBarcode(template.getBarcode())
.setCode(template.getCode())
+ .setBatch(normalizeMatnrBatchValue(template.getBatch()))
.setName(template.getName())
.setId(null)
.setDescrible(template.getDescrible())
@@ -277,6 +404,7 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
matnr1.setCode(ruleCode);
}
+ normalizeMatnrBatchOnEntity(matnr1);
/**
* 鎵╁睍瀛楁瀛樺叆搴�
*/
--
Gitblit v1.9.1