From f2eebff1b85e3b44bdc00dcd5eb00127edef617f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 15:31:05 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
index c17d05c..6b07c5c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ManTagController.java
@@ -8,8 +8,8 @@
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.domain.entity.MatPrint;
import com.zy.asrs.common.utils.*;
-import com.zy.asrs.common.wms.entity.ManMat;
-import com.zy.asrs.common.wms.entity.ManTag;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.entity.Tag;
import com.zy.asrs.common.wms.service.ManMatService;
import com.zy.asrs.common.wms.service.ManTagService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -54,14 +54,14 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange) {
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManTag::getId, condition);
+ wrapper.like(Tag::getId, condition);
}
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(ManTag::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(ManTag::getCreateTime, DateUtils.convert(range[1]));
+ wrapper.ge(Tag::getCreateTime, DateUtils.convert(range[0]));
+ wrapper.le(Tag::getCreateTime, DateUtils.convert(range[1]));
}
return R.ok(manTagService.page(new Page<>(curr, limit), wrapper));
}
@@ -69,18 +69,18 @@
@RequestMapping(value = "/manTag/add/auth")
@ManagerAuth
- public R add(ManTag manTag) {
- manTagService.save(manTag);
+ public R add(Tag tag) {
+ manTagService.save(tag);
return R.ok();
}
@RequestMapping(value = "/manTag/update/auth")
@ManagerAuth
- public R update(ManTag manTag){
- if (Cools.isEmpty(manTag) || null==manTag.getId()){
+ public R update(Tag tag){
+ if (Cools.isEmpty(tag) || null== tag.getId()){
return R.error();
}
- manTagService.updateById(manTag);
+ manTagService.updateById(tag);
return R.ok();
}
@@ -96,14 +96,14 @@
@RequestMapping(value = "/manTagQuery/auth")
@ManagerAuth
public R query(String condition) {
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(ManTag::getId, condition);
- Page<ManTag> page = manTagService.page(new Page<>(0, 10), wrapper);
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(Tag::getId, condition);
+ Page<Tag> page = manTagService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ManTag manTag : page.getRecords()){
+ for (Tag tag : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", manTag.getId());
- map.put("value", manTag.getId());
+ map.put("id", tag.getId());
+ map.put("value", tag.getId());
result.add(map);
}
return R.ok(result);
@@ -113,9 +113,9 @@
@ManagerAuth
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ManTag> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<Tag> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(ManTag::getId, condition);
+ wrapper.like(Tag::getId, condition);
}
manTagService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
return R.ok().add(vos);
@@ -168,7 +168,7 @@
}
List<MatPrint> res = new ArrayList<>();
for (String matnr : param){
- ManMat mat = manMatService.getOne(new LambdaQueryWrapper<ManMat>().eq(ManMat::getMatnr, matnr));
+ Mat mat = manMatService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatPrint print = new MatPrint();
print.setMatnr(mat.getMatnr());
@@ -217,12 +217,12 @@
@RequestMapping("/mat/all/get/kv")
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
- LambdaQueryWrapper<ManMat> wrapper = new LambdaQueryWrapper<ManMat>()
- .like(ManMat::getMatnr, condition).or().like(ManMat::getMaktx, condition)
- .orderByAsc(ManMat::getCreateTime);
- List<ManMat> mats = manMatService.page(new Page<>(1, 30), wrapper).getRecords();
+ LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<Mat>()
+ .like(Mat::getMatnr, condition).or().like(Mat::getMaktx, condition)
+ .orderByAsc(Mat::getCreateTime);
+ List<Mat> mats = manMatService.page(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
- for (ManMat mat : mats) {
+ for (Mat mat : mats) {
KeyValueVo vo = new KeyValueVo();
vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
vo.setValue(mat.getId());
--
Gitblit v1.9.1