czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品出入库 和 耗材出入库 日志记录 明确描述

Browse Source
This commit is contained in:
wangw
2024-08-03 14:43:30 +08:00
parent 96b9d50088
commit b70c00667a
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
View File

@@ -96,6 +96,26 @@ public class LogServiceImpl implements LogService {
String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint); String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint);
// 描述 // 描述
log.setDescription(split[0] + ":" + value); log.setDescription(split[0] + ":" + value);
}
if (split.length == 3) {
// String v1 = SpelUtil.generateKeyBySpEL(split[1], joinPoint);
String v2 = SpelUtil.generateKeyBySpEL(split[2], joinPoint);
if (methodName.contains("createOutAndONOperate")) {
//subType 1入库 -1出库
if ("purchase".equals(v2) || "purveyor".equals(v2)) {
v2 = "入库";
} else {
v2 = "出库";
}
}else if(methodName.contains("stockInOut")){
if (("in".equals(v2) || "purveyor".equals(v2))) {
v2 = "入库";
} else {
v2 = "出库";
}
}
// 描述
log.setDescription(split[0] + ":" + v2 );
}else { }else {
log.setDescription(split[0]); log.setDescription(split[0]);
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
View File

@@ -71,7 +71,7 @@ public class TbConsInfoController {
} }
@PostMapping(value = "stockInOut") @PostMapping(value = "stockInOut")
@Log("耗材出入库") @Log("耗材出入库::#resources.type")
@ApiOperation("耗材出入库") @ApiOperation("耗材出入库")
public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception { public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception {

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
View File

@@ -61,7 +61,7 @@ public class TbProductStockOperateController {
@PostMapping("/outAndOn") @PostMapping("/outAndOn")
@ApiOperation("新增/product/StockOperate") @ApiOperation("新增/product/StockOperate")
@Log("出入库") @Log("商品出入库::#outAndOnDto.type")
// @PreAuthorize("@el.check('tbProductStockOperate:add')") // @PreAuthorize("@el.check('tbProductStockOperate:add')")
public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){ public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED); return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED);