From 291693e396d5a057a30357712f7e7446078c0a29 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 24 九月 2024 16:48:59 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
index eed691f..b11d721 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -3,15 +3,18 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
-import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.MatField;
import com.zy.asrs.wms.asrs.entity.MatFieldValue;
+import com.zy.asrs.wms.asrs.entity.Tag;
+import com.zy.asrs.wms.asrs.entity.template.MatTemplate;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatFieldValueService;
+import com.zy.asrs.wms.asrs.service.TagService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -22,7 +25,9 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -37,6 +42,8 @@
private MatFieldService matFieldService;
@Autowired
private MatFieldValueService matFieldValueService;
+ @Autowired
+ private TagService tagService;
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/page")
@@ -129,7 +136,7 @@
ExcelUtil.build(ExcelUtil.create(list, Mat.class, matFields), response);
}
- private void setMatField(HashMap<String, Object> param, Mat mat) {
+ private void setMatField(Map<String, Object> param, Mat mat) {
//鑾峰彇鎵╁睍瀛楁
List<MatField> matFields = matFieldService.list();
for (MatField matField : matFields) {
@@ -137,19 +144,83 @@
MatFieldValue fieldValue = matFieldValueService.getOne(new LambdaQueryWrapper<MatFieldValue>()
.eq(MatFieldValue::getMatId, mat.getId())
.eq(MatFieldValue::getFieldId, matField.getId()));
+ Object valueObj = param.get(matField.getName());
+ String value = "";
+ if(valueObj != null) {
+ value = valueObj.toString();
+ }
+
if (fieldValue == null) {
fieldValue = new MatFieldValue();
fieldValue.setMatId(mat.getId());
fieldValue.setFieldId(matField.getId());
fieldValue.setName(matField.getName());
- fieldValue.setValue(param.get(matField.getName()).toString());
+ fieldValue.setValue(value);
matFieldValueService.save(fieldValue);
}else {
- fieldValue.setValue(param.get(matField.getName()).toString());
+ fieldValue.setValue(value);
matFieldValueService.updateById(fieldValue);
}
}
}
}
+ @PreAuthorize("hasAuthority('asrs:mat:list')")
+ @PostMapping("/mat/exportTemplate")
+ public void exportTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ArrayList<MatTemplate> list = new ArrayList<>();
+ List<MatField> matFields = matFieldService.getMatFields();
+ ExcelUtil.build(ExcelUtil.create(list, MatTemplate.class, matFields), response);
+ }
+
+ @PostMapping("/mat/upload")
+ @Transactional
+ public R upload(@RequestParam("file") MultipartFile file) {
+ List<MatTemplate> list = ExcelUtil.parseExcelFile(file, MatTemplate.class);
+ for (MatTemplate matTemplate : list) {
+ String firstTag = matTemplate.getFirstTag();
+ String secondTag = matTemplate.getSecondTag();
+ Tag tag1 = null;
+ Long tagId = null;
+
+ if (!Cools.isEmpty(firstTag)) {
+ Tag tag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, firstTag));
+ if (tag == null) {
+ tag = new Tag();
+ tag.setName(firstTag);
+ tag.setParentId(0L);
+ tagService.save(tag);
+ }
+
+ tagId = tag.getId();
+ tag1 = tag;
+ }
+
+ if (!Cools.isEmpty(secondTag)) {
+ if (tag1 != null) {
+ Tag tag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, secondTag).eq(Tag::getParentId, tag1.getId()));
+ if (tag == null) {
+ tag = new Tag();
+ tag.setName(secondTag);
+ tag.setParentId(tag1.getId());
+ tagService.save(tag);
+ }
+
+ tagId = tag.getId();
+ }
+ }
+
+
+ Mat mat = new Mat();
+ mat.sync(matTemplate);
+ mat.setTagId(tagId);
+ if (!matService.save(mat)) {
+ throw new CoolException("鍒涘缓鍟嗗搧澶辫触");
+ }
+ //璁剧疆鎵╁睍瀛楁
+ setMatField(matTemplate.getDynamicFields(), mat);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1