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/inspectiontask/controller/InspectionTaskController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index a32dd4b..40445d1 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
@@ -9,17 +10,19 @@
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* @author :yys
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "宸℃浠诲姟绠＄悊")
+@Api(tags = "宸℃浠诲姟璁板綍")
@RequestMapping("/inspectionTask")
public class InspectionTaskController extends BaseController {
@@ -36,13 +39,27 @@
return R.ok(list);
}
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/export")
+ @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟璁板綍")
+ public void export(HttpServletResponse response) {
+ Page page = new Page<>(-1,-1);
+ InspectionTaskDto timingTask = new InspectionTaskDto();
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskList(page,timingTask);
+ ExcelUtil<InspectionTaskDto> util = new ExcelUtil<>(InspectionTaskDto.class);
+ util.exportExcel(response, list.getRecords(), "瀵煎嚭瀹氭椂浠诲姟璁板綍");
+ }
+
/**
* 宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@PostMapping("/addOrEditInspectionTask")
@ApiOperation("宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
- public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
+ public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
}
--
Gitblit v1.9.3