From b70c00667ac9a6df9571eb315a5ebeddbec533fd Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 3 Aug 2024 14:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=20=E5=92=8C=20=E8=80=97=E6=9D=90=E5=87=BA=E5=85=A5=E5=BA=93=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=20=E6=98=8E=E7=A1=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/LogServiceImpl.java  | 20 +++++++++++++++++++
 .../cons/rest/TbConsInfoController.java       |  2 +-
 .../TbProductStockOperateController.java      |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
index 7e6e2f1d..32095301 100644
--- a/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
@@ -96,6 +96,26 @@ public class LogServiceImpl implements LogService {
             String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint);
             // 描述
             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 {
             log.setDescription(split[0]);
         }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
index 7c50ba9a..bcff3be2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
@@ -71,7 +71,7 @@ public class TbConsInfoController {
     }
 
     @PostMapping(value = "stockInOut")
-    @Log("耗材出入库")
+    @Log("耗材出入库::#resources.type")
     @ApiOperation("耗材出入库")
     public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception {
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
index 3e222c74..86890fcb 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
@@ -61,7 +61,7 @@ public class TbProductStockOperateController {
 
     @PostMapping("/outAndOn")
     @ApiOperation("新增/product/StockOperate")
-    @Log("出入库")
+    @Log("商品出入库::#outAndOnDto.type")
 //    @PreAuthorize("@el.check('tbProductStockOperate:add')")
     public ResponseEntity<Object> createOutAndONOperate(@RequestBody OutAndOnDto outAndOnDto){
         return new ResponseEntity<>(tbProductStockOperateService.createOutAndONOperate(outAndOnDto),HttpStatus.CREATED);