From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 22c3cef..4718c8e 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.utils.TreeUtils;
import com.zy.asrs.common.wms.entity.Mat;
@@ -52,15 +53,16 @@
@RequestParam(required = false) String condition,
@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);
- }
+ QueryWrapper<Mat> wrapper = new QueryWrapper<>();
+// convert(param, wrapper);
+ wrapper.eq("host_id", getHostId());
+// if (!Cools.isEmpty(condition)) {
+// wrapper.like(Mat::getId, condition);
+// }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(Mat::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(Mat::getCreateTime, DateUtils.convert(range[1]));
+ wrapper.ge("create_time", DateUtils.convert(range[0]));
+ wrapper.le("create_time", DateUtils.convert(range[1]));
}
Object tagId = param.get("tag_id");
ArrayList<Long> nodes = new ArrayList<>();
@@ -68,20 +70,45 @@
tagId = getOriginTag().getId();
}
treeUtils.getTagIdList(Long.parseLong(tagId.toString()), nodes);
- wrapper.in(Mat::getTagId, nodes);
+ wrapper.in("tag_id", nodes);
if (!Cools.isEmpty(param.get("matnr"))) {
- wrapper.eq(Mat::getMatnr, param.get("matnr"));
+ wrapper.eq("matnr", param.get("matnr"));
}
if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.eq(Mat::getMaktx, param.get("maktx"));
+ wrapper.eq("maktx", param.get("maktx"));
}
+ param.remove("matnr");
+ param.remove("maktx");
+ allLike(Mat.class, param.keySet(), wrapper, condition);
return R.ok(matService.page(new Page<>(curr, limit), wrapper));
}
+
+
+// private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
+// for (Map.Entry<String, Object> entry : map.entrySet()){
+// String val = String.valueOf(entry.getValue());
+// if (val.contains(RANGE_TIME_LINK)){
+// String[] dates = val.split(RANGE_TIME_LINK);
+// wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+// wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+// } else {
+// if (entry.getKey().equals("locNo")) {
+// wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+// } else {
+// wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+// }
+// }
+// }
+// }
@RequestMapping(value = "/mat/add/auth")
@ManagerAuth
public R add(Mat mat) {
+ int count = matService.count(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, mat.getMatnr()));
+ if(count > 0){
+ return R.error("褰撳墠鐗╂枡鍙峰凡瀛樺湪");
+ }
mat.setHostId(getHostId());
matService.save(mat);
return R.ok();
--
Gitblit v1.9.1