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/DeviceMaintenanceController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 09e7b22..0804b79 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -9,7 +9,7 @@
import com.ruoyi.device.service.IDeviceMaintenanceService;
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.*;
@@ -28,14 +28,14 @@
@Autowired
private IDeviceLedgerService deviceLedgerService;
- @ApiModelProperty("璁惧淇濆吇鍒楄〃")
+ @ApiOperation("璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
- @ApiModelProperty("娣诲姞璁惧淇濆吇")
+ @ApiOperation("娣诲姞璁惧淇濆吇")
public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
@@ -43,14 +43,14 @@
return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
+ @ApiOperation("鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
return AjaxResult.success(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
- @ApiModelProperty("淇敼璁惧淇濆吇")
+ @ApiOperation("淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
@@ -59,14 +59,14 @@
}
@PostMapping ("maintenance")
- @ApiModelProperty("淇敼璁惧淇濆吇")
+ @ApiOperation("淇敼璁惧淇濆吇")
public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
- @ApiModelProperty("鍒犻櫎璁惧淇濆吇")
+ @ApiOperation("鍒犻櫎璁惧淇濆吇")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
@@ -76,7 +76,7 @@
}
@PostMapping("export")
- @ApiModelProperty("瀵煎嚭璁惧淇濆吇")
+ @ApiOperation("瀵煎嚭璁惧淇濆吇")
public void export(HttpServletResponse response, Long[] ids) {
deviceMaintenanceService.export(response, ids);
}
--
Gitblit v1.9.3