From 92b62eae6ee68bd693457a16f3bdfb1d684a8fec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:37:17 +0800
Subject: [PATCH] #修复 库位修改保存失败修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 6 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 8ffcc4f..30f9f74 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
@@ -2,33 +2,110 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
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.entity.Fields;
+import com.vincent.rsf.server.system.service.FieldsService;
+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.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
@Service("matnrService")
public class MatnrServiceImpl extends ServiceImpl<MatnrMapper, Matnr> implements MatnrService {
+ @Autowired
+ private MatnrGroupService matnrGroupService;
+
/**
+ * @return
+ * @throws
* @author Ryan
* @description 鐗╂枡鏁版嵁瀵煎叆鎺ュ鐞嗗疄鐜�
- * @throws
- * @return
* @time 2025/3/3 13:08
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importExcels(MultipartFile file) throws Exception {
+ public R importExcels(MultipartFile file) throws Exception {
//璇诲彇涓婁紶鏂囦欢鍐呭
- ExcelImportResult<MatnrsTemplate> result = ExcelImportUtil.importExcelMore(file.getInputStream(), MatnrsTemplate.class, ExcelUtil.getDefaultImportParams());
- //TODO 鐗╂枡鍐欏叆澶勭悊
+ ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), MatnrsTemplate.class, ExcelUtil.getDefaultImportParams());
+ 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);
+ //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
+ FieldsUtils.saveFields(template, uuid);
+ }
+ matnrs.add(matnr);
+ });
+
+ if (!this.saveBatch(matnrs)) {
+ throw new CoolException("瀵煎叆澶辫触锛侊紒");
+ }
+ return R.ok("瀵煎叆鎴愬姛锛侊紒");
+ }
+
+ @Override
+ public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+ PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
+ List<Matnr> records = page.getRecords();
+ for (Matnr record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return page;
}
}
--
Gitblit v1.9.1