From b07a6193d605fdf3154bf81faed0244030679b60 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 16:49:09 +0800
Subject: [PATCH] #修改 1.添加库位类型绑定 2.物料添加动态字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 3a6d4e2..af0d0cf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -41,7 +41,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add(matnrService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add( matnrService.getMatnrPage(pageParam));
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -56,6 +56,7 @@
return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
}
+
@PreAuthorize("hasAuthority('manager:matnr:list')")
@GetMapping("/matnr/{id}")
public R get(@PathVariable("id") Long id) {
@@ -67,9 +68,7 @@
@PostMapping("/matnr/save")
public R save(@RequestBody Matnr matnr) {
matnr.setCreateBy(getLoginUserId());
- matnr.setCreateTime(new Date());
matnr.setUpdateBy(getLoginUserId());
- matnr.setUpdateTime(new Date());
if (!matnrService.save(matnr)) {
return R.error("Save Fail");
}
@@ -140,7 +139,7 @@
} else {
matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
}
- ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
--
Gitblit v1.9.1