From 6682d7c793f4a49bf13bf2f8a0170f188a701342 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 03 十一月 2025 21:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
index c6cf934..4940970 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ClinicOutboundGoodsDto;
import com.ruoyi.system.dto.InventoryDto;
@@ -192,6 +194,7 @@
@ApiOperation(value = "诊所 确认盘点")
@PostMapping(value = "/inventoryGoods")
+ @Log(title = "盘点管理-诊所确认盘点", businessType = BusinessType.UPDATE)
public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
erpGoodsService.inventoryGoods1(dto,user);
@@ -311,6 +314,7 @@
@ApiOperation(value = "诊所 入库商品操作")
@PostMapping(value = "/warehouseGoods")
+ @Log(title = "库存管理-诊所入库", businessType = BusinessType.INSERT)
public R<?> warehouseGoods(@RequestBody @Valid WarehouseGoodsDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -396,6 +400,7 @@
@ApiOperation(value = "诊所 出库商品操作")
@PostMapping(value = "/outboundGoods")
+ @Log(title = "库存管理-诊所出库", businessType = BusinessType.UPDATE)
public R<?> outboundGoods(@RequestBody @Valid ClinicOutboundGoodsDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
--
Gitblit v1.7.1