From 3743cba51af30aef646e620531509d7ba350b08e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 10 九月 2024 09:13:33 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 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 34e2c0e..eed691f 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
@@ -1,9 +1,17 @@
package com.zy.asrs.wms.asrs.controller;
+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.wms.asrs.entity.MatField;
+import com.zy.asrs.wms.asrs.entity.MatFieldValue;
+import com.zy.asrs.wms.asrs.service.MatFieldService;
+import com.zy.asrs.wms.asrs.service.MatFieldValueService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +25,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -28,13 +33,29 @@
@Autowired
private MatService matService;
+ @Autowired
+ private MatFieldService matFieldService;
+ @Autowired
+ private MatFieldValueService matFieldValueService;
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class);
- return R.ok().add(matService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Mat, BaseParam> page = matService.page(pageParam, pageParam.buildWrapper(true));
+
+ JSONObject data = JSON.parseObject(JSON.toJSONString(page));
+
+ List<Mat> records = page.getRecords();
+ data.put("records", records);
+ for (Mat mat : records) {
+ List<MatFieldValue> list = matFieldValueService.list(new LambdaQueryWrapper<MatFieldValue>()
+ .eq(MatFieldValue::getMatId, mat.getId()));
+ mat.syncField(list);
+ }
+
+ return R.ok().add(data);
}
@PreAuthorize("hasAuthority('asrs:mat:list')")
@@ -52,17 +73,24 @@
@PreAuthorize("hasAuthority('asrs:mat:save')")
@OperationLog("娣诲姞鍟嗗搧妗ｆ")
@PostMapping("/mat/save")
- public R save(@RequestBody Mat mat) {
+ public R save(@RequestBody HashMap<String,Object> param) {
+ Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
if (!matService.save(mat)) {
return R.error("娣诲姞澶辫触");
}
+ //璁剧疆鎵╁睍瀛楁
+ setMatField(param, mat);
return R.ok("娣诲姞鎴愬姛");
}
@PreAuthorize("hasAuthority('asrs:mat:update')")
@OperationLog("淇敼鍟嗗搧妗ｆ")
@PostMapping("/mat/update")
- public R update(@RequestBody Mat mat) {
+ public R update(@RequestBody HashMap<String,Object> param) {
+ Mat mat = JSON.parseObject(JSON.toJSONString(param), Mat.class, Feature.DisableCircularReferenceDetect);
+ //璁剧疆鎵╁睍瀛楁
+ setMatField(param, mat);
+
if (!matService.updateById(mat)) {
return R.error("淇敼澶辫触");
}
@@ -96,7 +124,32 @@
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(matService.list(), Mat.class), response);
+ List<Mat> list = matService.parseMat(matService.list());
+ List<MatField> matFields = matFieldService.getMatFields();
+ ExcelUtil.build(ExcelUtil.create(list, Mat.class, matFields), response);
+ }
+
+ private void setMatField(HashMap<String, Object> param, Mat mat) {
+ //鑾峰彇鎵╁睍瀛楁
+ List<MatField> matFields = matFieldService.list();
+ for (MatField matField : matFields) {
+ if (param.containsKey(matField.getName())) {
+ MatFieldValue fieldValue = matFieldValueService.getOne(new LambdaQueryWrapper<MatFieldValue>()
+ .eq(MatFieldValue::getMatId, mat.getId())
+ .eq(MatFieldValue::getFieldId, matField.getId()));
+ 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());
+ matFieldValueService.save(fieldValue);
+ }else {
+ fieldValue.setValue(param.get(matField.getName()).toString());
+ matFieldValueService.updateById(fieldValue);
+ }
+ }
+ }
}
}
--
Gitblit v1.9.1