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/device/controller/DeviceDefectRecordController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index dc103fb..59b0b4f 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -2,14 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
-import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
-import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,12 +16,12 @@
public class DeviceDefectRecordController {
@Autowired
private DeviceDefectRecordService deviceDefectRecordService;
- @ApiModelProperty("璁惧缂洪櫡璁板綍鍒楄〃")
+ @ApiOperation("璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
- @ApiModelProperty("璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
+ @ApiOperation("璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
public AjaxResult find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
@@ -33,17 +30,17 @@
}
@PostMapping("/add")
- @ApiModelProperty("娣诲姞璁惧缂洪櫡璁板綍")
+ @ApiOperation("娣诲姞璁惧缂洪櫡璁板綍")
public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
- @ApiModelProperty("淇敼璁惧缂洪櫡璁板綍")
+ @ApiOperation("淇敼璁惧缂洪櫡璁板綍")
public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
- @ApiModelProperty("鍒犻櫎璁惧缂洪櫡璁板綍")
+ @ApiOperation("鍒犻櫎璁惧缂洪櫡璁板綍")
public AjaxResult delete(@PathVariable Long id) {
return AjaxResult.success(deviceDefectRecordService.removeById(id));
}
--
Gitblit v1.9.3