From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index ef1e7a4..bcfc20d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -1,24 +1,35 @@
package com.ruoyi.collaborativeApproval.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@RestController
@RequestMapping("/sealApplicationManagement")
+@Api(tags = "鐢ㄥ嵃鐢宠绠＄悊")
public class SealApplicationManagementController {
@Autowired
private SealApplicationManagementService sealApplicationManagementService;
+
+ @Autowired
+ private ISysNoticeService sysNoticeService;
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -29,7 +40,14 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
+ sealApplicationManagementService.save(sealApplicationManagement);
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\t"
+ +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
+ Arrays.asList(sealApplicationManagement.getApproveUserId()),
+ "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
+ return AjaxResult.success();
}
@PostMapping("/update")
@@ -47,4 +65,12 @@
return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
+ @ApiOperation(value = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ List<SealApplicationManagement> accountExpenses = sealApplicationManagementService.list();
+ ExcelUtil<SealApplicationManagement> util = new ExcelUtil<SealApplicationManagement>(SealApplicationManagement.class);
+ util.exportExcel(response, accountExpenses, "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭");
+ }
+
}
--
Gitblit v1.9.3