From 0e85601e2f80b6cb580c0fad9be9518f58c5882c Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 22:19:27 +0800
Subject: [PATCH] 云仓模拟视图数据sql
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 286 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 235 insertions(+), 51 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 07896ec..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
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -17,29 +16,160 @@
import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
+import com.vincent.rsf.server.manager.enums.MatnrLocLevel;
import com.vincent.rsf.server.manager.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.entity.Matnr;
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.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 {
@Autowired
private MatnrGroupService matnrGroupService;
+
+ @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
@@ -56,47 +186,13 @@
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
- List<Matnr> matnrs = new ArrayList<>();
- List<Map<String, String>> list = result.getList();
- list.forEach(template -> {
- Matnr matnr = new Matnr();
- matnr.setBarcode(template.get("barcode"))
- .setCode(template.get("code"))
- .setDescrible(template.get("describle"))
- .setColor(template.get("color"))
- .setFlagCheck(!Objects.isNull(template.get("flagCheck")) ? Short.parseShort(template.get("flagCheck")) : 0)
- .setWeight(!Objects.isNull(template.get("weight")) ? Double.parseDouble(template.get("weight")) : 0.0)
- .setValidWarn(!Objects.isNull(template.get("validWarn")) ? Integer.parseInt(template.get("validWarn")): 0)
- .setValid(!Objects.isNull(template.get("valid")) ? Integer.parseInt( template.get("valid")) : 0)
- .setUnit(template.get("unit"))
- .setStockUnit(template.get("purUnit"))
- .setSpec(template.get("spec"))
- .setStagn(!Objects.isNull(template.get("stagn")) ? Integer.parseInt(template.get("stagn")) : 0)
- .setModel(template.get("model"))
- .setGroupCode(template.get("groupCode"))
- .setPurUnit(template.get("purUnit"))
- .setStockLevel(!Objects.isNull(template.get("stockLevel")) ? Short.parseShort(template.get("stockLevel")) : 0)
- .setSafeQty(!Objects.isNull(template.get("safeQty")) ? Double.parseDouble(template.get("safeQty")) : 0)
- .setMinQty(!Objects.isNull(template.get("safeQty")) ? Double.parseDouble(template.get("minQty")) : 0);
- if (Objects.isNull(template.get("groupCode")) && Objects.isNull(template.get("groupName"))) {
- MatnrGroup matnrGroups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
- .eq(!Objects.isNull(template.get("groupCode")), MatnrGroup::getCode, template.get("groupCode"))
- .eq(!Objects.isNull(template.get("groupName")),MatnrGroup::getName, template.get("groupName")));
- matnr.setGroupId(matnrGroups.getId());
- }
- //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
- if (!FieldsUtils.getFieldsSta().isEmpty()) {
- String uuid = CommonUtil.randomUUID16();
- matnr.setFieldsIndex(uuid);
- //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
- try {
- FieldsUtils.saveFields(template, uuid);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- matnrs.add(matnr);
- });
+
+ List<MatnrsTemplate> list = result.getList();
+ /**
+ * 鑾峰彇瀵煎叆鐗╂枡妯℃澘
+ */
+ List<Matnr> matnrs = getMatnrTempletes(list);
+ assertNoDuplicateMatnrKeysInList(matnrs);
if (!this.saveBatch(matnrs)) {
throw new CoolException("瀵煎叆澶辫触锛侊紒");
@@ -104,19 +200,106 @@
return R.ok("瀵煎叆鎴愬姛锛侊紒");
}
+ /**
+ * 鑾峰彇鐗╂枡妯℃澘淇℃伅
+ * @param list
+ * @return
+ */
@Override
- public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
- QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
- if (params.containsKey("groupId")) {
- Object groupId = params.get("groupId");
- if (!Objects.isNull(groupId)) {
- List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
- if (!matnrGroups.isEmpty()) {
- List<Long> longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
- queryWrapper.or().in("group_id", longs);
+ public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) {
+ List<Matnr> matnrs = new ArrayList<>();
+ list.forEach(template -> {
+ Matnr matnr = new Matnr();
+ matnr.setBarcode(template.getBarcode())
+ .setCode(template.getCode())
+ .setBatch(normalizeMatnrBatchValue(template.getBatch()))
+ .setName(template.getName())
+ .setId(null)
+ .setDescrible(template.getDescrible())
+ .setColor(template.getColor())
+ .setFlagCheck(!Objects.isNull(template.getFlagCheck()) ? Short.parseShort(template.getFlagCheck()) : 0)
+ .setWeight(!Objects.isNull(template.getWeight()) ? Double.parseDouble(template.getWeight()) : 0.0)
+ .setValidWarn(!Objects.isNull(template.getValidWarn()) ? Integer.parseInt(template.getValidWarn()): 0)
+ .setValid(!Objects.isNull(template.getValid()) ? Integer.parseInt( template.getValid()) : 0)
+ .setUnit(template.getUnit())
+ .setStockUnit(template.getPurUnit())
+ .setSize(template.getSize())
+ .setSpec(template.getSpec())
+ .setStagn(!Objects.isNull(template.getStagn()) ? Integer.parseInt(template.getStagn()) : 0)
+ .setModel(template.getModel())
+ .setGroupCode(template.getGroupCode())
+ .setPurUnit(template.getPurUnit())
+ .setStockLevel(!Objects.isNull(template.getStockLevel()) ? MatnrLocLevel.getTypeVal(template.getStockLevel()) : null)
+ .setSafeQty(!Objects.isNull(template.getSafeQty()) ? Double.parseDouble(template.getSafeQty()) : 0)
+ .setMinQty(!Objects.isNull(template.getMinQty()) ? Double.parseDouble(template.getMinQty()) : 0);
+ if (!Objects.isNull(template.getGroupCode()) || !Objects.isNull(template.getGroupName())) {
+ MatnrGroup matnrGroups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(!Objects.isNull(template.getGroupCode()), MatnrGroup::getCode, template.getGroupCode())
+ .eq(!Objects.isNull(template.getGroupName()), MatnrGroup::getName, template.getGroupName()));
+ if (!Objects.isNull(matnrGroups)) {
+ matnr.setGroupId(matnrGroups.getId()).setGroupCode(matnrGroups.getCode());
}
}
+// List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>()
+// .eq(Fields::getUnique, CommonStatus.COMMONSTATUS_NO.val)
+// .eq(Fields::getFlagEnable, CommonStatus.COMMONSTATUS_YES.val));
+//
+// //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
+// if (!fields.isEmpty()) {
+// //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
+// try {
+// Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(template), Map.class);
+// String uuid = CommonUtil.randomUUID16();
+// boolean b = FieldsUtils.saveFields(map, uuid);
+// if (b) {
+// matnr.setFieldsIndex(uuid);
+// }
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
+ matnrs.add(matnr);
+ });
+ return matnrs;
+ }
+
+ @Override
+ public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
+ List<Long> longs = new ArrayList<>();
+ if (params.containsKey("groupId")) {
+ if (!Objects.isNull(params.get("groupId"))) {
+ Object groupId = params.get("groupId");
+ MatnrGroup group = matnrGroupService.getById(groupId.toString());
+ if (null != group){
+ pageParam.getWhere().getMap().remove("groupId");
+ if(!group.getCode().equals("01")){
+ List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
+ .select(MatnrGroup::getId));
+ if (!matnrGroups.isEmpty()) {
+ longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+
+ }
+ longs.add(group.getId());
+ }
+ }
+ }
+
}
+ // locUseStatus 浠呯敤浜庝笅鏂� EXISTS 瀛愭煡璇紝涓嶈兘浣滀负 man_matnr 琛ㄥ瓧娈靛弬涓� buildWrapper
+ Object locUseStatus = params.get("locUseStatus");
+ if (pageParam.getWhere() != null && pageParam.getWhere().getMap() != null) {
+ pageParam.getWhere().getMap().remove("locUseStatus");
+ }
+ QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.in(!longs.isEmpty(),"group_id", longs);
+ // 鍑哄簱閫夌墿鏂欙細鎸夊簱浣嶇姸鎬佺瓫閫夛紙浠呭睍绀哄湪璇ュ簱浣嶇姸鎬佷笅鏈夋湁鏁堝簱瀛樼殑鐗╂枡锛屼笌 listStockByMatnrIds 鍙ｅ緞涓�鑷达細鎺掗櫎宸插垹鏄庣粏涓庡凡鍒犲簱浣嶏級
+ if (locUseStatus != null && StringUtils.isNotBlank(locUseStatus.toString())) {
+ String useStatus = locUseStatus.toString().replace("'", "''");
+ queryWrapper.apply("EXISTS (SELECT 1 FROM man_loc_item li INNER JOIN man_loc l ON li.loc_id = l.id AND (l.deleted = 0 OR l.deleted IS NULL) WHERE li.matnr_id = man_matnr.id AND li.deleted = 0 AND l.use_status = '" + useStatus + "')");
+ }
+
+ FieldsUtils.setFieldsFilters(queryWrapper,pageParam,Matnr.class);
/**鎷兼帴鎵╁睍瀛楁*/
PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
List<Matnr> records = page.getRecords();
@@ -221,6 +404,7 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
matnr1.setCode(ruleCode);
}
+ normalizeMatnrBatchOnEntity(matnr1);
/**
* 鎵╁睍瀛楁瀛樺叆搴�
*/
--
Gitblit v1.9.1