From f53706e7e8a7b4e0278917e9d3cdfbc877de177d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 16:59:47 +0800
Subject: [PATCH] #平库下架完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 3b95db1..22c3cef 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
@@ -5,6 +5,7 @@
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.entity.OrderDetl;
import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
@@ -30,6 +31,18 @@
@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")
@@ -123,10 +136,34 @@
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(String.valueOf(item.getId()), item.getId())));
+ matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getMatnr(), item.getId())));
return R.ok().add(vos);
}
+ @RequestMapping(value = "/mat/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") String id) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getId, id).eq(Mat::getHostId, getHostId()));
+ if (mat == null) {
+ return R.ok();
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setAnfme(0.0D);
+ 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));
+ }
+
}
--
Gitblit v1.9.1