From a5abbaea5e8a35e77df3a06a88b8b96bebbf79b4 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 14 十月 2025 08:47:57 +0800
Subject: [PATCH] 新增物料更新接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 fa494fc..181193c 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
@@ -17,6 +17,7 @@
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;
@@ -56,8 +57,26 @@
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
- List<Matnr> matnrs = new ArrayList<>();
+
List<MatnrsTemplate> list = result.getList();
+ /**
+ * 鑾峰彇瀵煎叆鐗╂枡妯℃澘
+ */
+ List<Matnr> matnrs = getMatnrTempletes(list);
+
+ if (!this.saveBatch(matnrs)) {
+ throw new CoolException("瀵煎叆澶辫触锛侊紒");
+ }
+ return R.ok("瀵煎叆鎴愬姛锛侊紒");
+ }
+
+ /**
+ * 鑾峰彇鐗╂枡妯℃澘淇℃伅
+ * @param list
+ * @return
+ */
+ public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) {
+ List<Matnr> matnrs = new ArrayList<>();
list.forEach(template -> {
Matnr matnr = new Matnr();
matnr.setBarcode(template.getBarcode())
@@ -78,10 +97,10 @@
.setModel(template.getModel())
.setGroupCode(template.getGroupCode())
.setPurUnit(template.getPurUnit())
- .setStockLevel(!Objects.isNull(template.getStockLevel()) ? Short.parseShort(template.getStockLevel()) : 0)
+ .setStockLevel(MatnrLocLevel.getTypeVal(template.getStockLevel()))
.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()));
@@ -103,11 +122,7 @@
}
matnrs.add(matnr);
});
-
- if (!this.saveBatch(matnrs)) {
- throw new CoolException("瀵煎叆澶辫触锛侊紒");
- }
- return R.ok("瀵煎叆鎴愬姛锛侊紒");
+ return matnrs;
}
@Override
--
Gitblit v1.9.1