From d8b80bb0c09f35ca67091ec863baeb922d032844 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 13:59:01 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index a38d839..3b95db1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -1,7 +1,9 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.utils.TreeUtils;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -10,6 +12,7 @@
import com.zy.asrs.framework.domain.KeyValueVo;
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
+import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +23,8 @@
@Autowired
private MatService matService;
+ @Autowired
+ private TreeUtils treeUtils;
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -32,8 +37,10 @@
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange) {
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Mat::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(Mat::getId, condition);
}
@@ -42,6 +49,19 @@
wrapper.ge(Mat::getCreateTime, DateUtils.convert(range[0]));
wrapper.le(Mat::getCreateTime, DateUtils.convert(range[1]));
}
+ Object tagId = param.get("tag_id");
+ ArrayList<Long> nodes = new ArrayList<>();
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
+ }
+ treeUtils.getTagIdList(Long.parseLong(tagId.toString()), nodes);
+ wrapper.in(Mat::getTagId, nodes);
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.eq(Mat::getMatnr, param.get("matnr"));
+ }
+ if (!Cools.isEmpty(param.get("maktx"))) {
+ wrapper.eq(Mat::getMaktx, param.get("maktx"));
+ }
return R.ok(matService.page(new Page<>(curr, limit), wrapper));
}
@@ -49,6 +69,7 @@
@RequestMapping(value = "/mat/add/auth")
@ManagerAuth
public R add(Mat mat) {
+ mat.setHostId(getHostId());
matService.save(mat);
return R.ok();
}
@@ -65,9 +86,15 @@
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- matService.removeById(id);
+ public R delete(@RequestParam String param){
+ List<Mat> list = JSONArray.parseArray(param, Mat.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (Mat entity : list){
+ if (!matService.remove(new LambdaQueryWrapper<>(entity))) {
+ throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
return R.ok();
}
@@ -77,6 +104,7 @@
public R query(String condition) {
LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
wrapper.like(Mat::getId, condition);
+ wrapper.eq(Mat::getHostId, getHostId());
Page<Mat> page = matService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Mat mat : page.getRecords()){
@@ -93,6 +121,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Mat::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(Mat::getId, condition);
}
--
Gitblit v1.9.1