From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核
---
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index 369a65e..d57718e 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -1,11 +1,22 @@
package com.ruoyi.approve.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.util.List;
+
+@Api(tags = "瀹℃壒璁板綍")
@RestController
@RequestMapping("/approveNode")
public class ApproveNodeController {
@@ -18,6 +29,7 @@
* @return
*/
@GetMapping("/details/{id}")
+ @ApiOperation(value = "娴佺▼鐘舵�佽鎯�")
public AjaxResult details(@PathVariable String id) {
return AjaxResult.success(approveNodeService.details(id));
}
@@ -28,11 +40,22 @@
* @return
*/
@PostMapping("/updateApproveNode")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) {
+ @Transactional(rollbackFor = Exception.class)
+ @ApiOperation(value = "瀹℃壒鑺傜偣")
+ public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
return AjaxResult.success();
}
+ @ApiOperation(value = "閲囪喘瀹℃牳濉啓搴撲綅鍏ュ簱")
+ @PostMapping("/purchaseApprove")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult purchaseApprove(@RequestBody List<SalesLedgerProduct> salesLedgerProducts) {
+ approveNodeService.purchaseApprove(salesLedgerProducts);
+ return AjaxResult.success();
+ }
+
+
/**
* 鍒濆鍖栧鎵硅妭鐐�
* @param id
--
Gitblit v1.9.3