From 4a20998cd4ff8ccce471fed8b766ee928d5255dc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 11 十月 2024 11:18:56 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 121 ++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 11 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 98cec1f..d3ac1d2 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,10 +2,15 @@
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.LocDetl;
+import com.zy.asrs.common.wms.entity.LocMast;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.service.LocDetlService;
+import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
@@ -26,11 +31,27 @@
private MatService matService;
@Autowired
private TreeUtils treeUtils;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
return R.ok(matService.getById(id));
+ }
+
+ @RequestMapping(value = "/mat/auth")
+ @ManagerAuth
+ public R find(@RequestParam("matnr") String matnr) {
+ Mat one = matService.getOne(new LambdaQueryWrapper<Mat>()
+ .eq(Mat::getMatnr, matnr)
+ .eq(Mat::getHostId, getHostId()));
+ if (Cools.isEmpty(one)){
+ return R.error("鏈煡璇㈠埌鐩稿叧鐗╂枡");
+ }
+ return R.ok(one);
}
@RequestMapping(value = "/mat/page/auth")
@@ -40,15 +61,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<>();
@@ -56,20 +78,53 @@
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.like("matnr", param.get("matnr"));
}
if (!Cools.isEmpty(param.get("maktx"))) {
- wrapper.eq(Mat::getMaktx, param.get("maktx"));
+ wrapper.like("maktx", param.get("maktx"));
}
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ wrapper.like("decrees", param.get("decrees"));
+ }
+// if (!Cools.isEmpty(param.get("owner$"))) {
+// wrapper.eq("owner", param.get("owner$"));
+// }
+ param.remove("matnr");
+ param.remove("maktx");
+ param.remove("decrees");
+// param.remove("owner$");
+ 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();
@@ -124,7 +179,7 @@
LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Mat::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
- wrapper.like(Mat::getId, condition);
+ wrapper.like(Mat::getMatnr, condition);
}
matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getMatnr(), item.getId())));
return R.ok().add(vos);
@@ -143,4 +198,48 @@
return R.ok().add(orderDetl);
}
+ @RequestMapping(value = "/mat/list/pda/page/auth")
+ @ManagerAuth
+ public R pdaPageList(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Mat::getHostId, getHostId());
+ wrapper.orderBy(true, false,Mat::getCreateTime);
+ return R.ok().add(matService.page(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/mat/pad/search")
+ @ManagerAuth
+ public R padSearch(@RequestParam("matnr") String matnr) {
+ List<Mat> list = matService.list(new LambdaQueryWrapper<Mat>()
+ .like(Mat::getMatnr, matnr)
+ .eq(Mat::getHostId, getHostId()));
+ if (list.isEmpty()){
+ return R.error("鏈煡璇㈠埌鐩稿叧鐗╂枡");
+ }
+ return R.ok(list);
+ }
+
+ @RequestMapping(value = "/mat/pad/searchLoc")
+ @ManagerAuth
+ public R padSearchLoc(@RequestParam("matnr") String matnr) {
+ List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getMatnr, matnr).eq(LocDetl::getHostId, getHostId()));
+
+ ArrayList<LocDetl> locDetls = new ArrayList<>();
+ for (LocDetl locDetl : list) {
+ LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locDetl.getLocNo()).eq(LocMast::getHostId, locDetl.getHostId()));
+ if (one == null) {
+ continue;
+ }
+
+ if (!one.getLocSts().equals("F")) {
+ continue;
+ }
+
+ locDetls.add(locDetl);
+ }
+ return R.ok(locDetls);
+ }
+
}
--
Gitblit v1.9.1