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/TErpProcurementController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 9cae021..365d92b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
+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.common.utils.DateUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AddProcurementDto;
@@ -155,6 +157,7 @@
@ApiOperation(value = "添加采购")
@PostMapping(value = "/addProcurement")
+ @Log(title = "采购管理-添加采购", businessType = BusinessType.INSERT)
public R<String> addProcurement(@RequestBody @Valid List<AddProcurementDto> dtos) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -177,6 +180,7 @@
@ApiOperation(value = "删除采购")
@DeleteMapping(value = "/delProcurement/{id}")
+ @Log(title = "采购管理-删除采购", businessType = BusinessType.DELETE)
public R<String> delProcurement(@PathVariable String id) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -231,6 +235,7 @@
@ApiOperation(value = "采购详情--发货(仓库角色)")
@PostMapping(value = "/detailProcurementSend")
+ @Log(title = "采购管理-发货", businessType = BusinessType.UPDATE)
public R<?> detailProcurementSend(@RequestBody DetailProcurementSendDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -315,6 +320,7 @@
@ApiOperation(value = "采购详情入库")
@PostMapping(value = "/updateStatusProcurement")
+ @Log(title = "采购管理-入库", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public R<DetailProcurementVO> updateStatusProcurement(@RequestBody @Valid UpdateStatusProcurementLastDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
--
Gitblit v1.7.1