From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 fe62567..524ce11 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,12 +16,14 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +41,9 @@
@Autowired
private MatnrGroupService matnrGroupService;
+
+ @Autowired
+ private FieldsService fieldsService;
/**
* @return
@@ -74,6 +78,7 @@
* @param list
* @return
*/
+ @Override
public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) {
List<Matnr> matnrs = new ArrayList<>();
list.forEach(template -> {
@@ -81,6 +86,7 @@
matnr.setBarcode(template.getBarcode())
.setCode(template.getCode())
.setName(template.getName())
+ .setId(null)
.setDescrible(template.getDescrible())
.setColor(template.getColor())
.setFlagCheck(!Objects.isNull(template.getFlagCheck()) ? Short.parseShort(template.getFlagCheck()) : 0)
@@ -89,36 +95,41 @@
.setValid(!Objects.isNull(template.getValid()) ? Integer.parseInt( template.getValid()) : 0)
.setUnit(template.getUnit())
.setStockUnit(template.getPurUnit())
- .setShipperId(template.getShipperId())
.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()) ? Short.parseShort(template.getStockLevel()) : 0)
+ .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())) {
+ 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()));
- matnr.setGroupId(matnrGroups.getId());
- }
- //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
- if (!FieldsUtils.getFieldsSta().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);
+ .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;
--
Gitblit v1.9.1