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/production/controller/ProcessRouteItemController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
index d55c2c9..6a4f8a7 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -1,20 +1,19 @@
package com.ruoyi.production.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProcessRouteItemService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
-
@RestController
-@RequestMapping("processRouteItem")
+@RequestMapping("/processRouteItem")
@Api(tags = "宸ヨ壓璺嚎鏄庣粏")
public class ProcessRouteItemController {
@Autowired
@@ -26,12 +25,21 @@
}
@PostMapping ()
- public R add(@RequestBody List<ProcessRouteItem> processRouteItem) {
- return R.ok(processRouteItemService.saveBatch(processRouteItem));
+ @ApiOperation("鏂板淇敼")
+ public R addOrUpdate(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.saveOrUpdate(processRouteItem));
}
- @PutMapping ()
- public R update(@RequestBody List<ProcessRouteItem> processRouteItem) {
- processRouteItemService.remove(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRouteItem.get(0).getRouteId()));
- return R.ok(processRouteItemService.saveBatch(processRouteItem));
+
+ @PostMapping ("/sort")
+ @ApiOperation("鎺掑簭")
+ public R sort(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.sort(processRouteItem));
+ }
+
+ @ApiOperation("鍒犻櫎宸ヨ壓璺嚎鏄庣粏")
+ @DeleteMapping("/batchDelete/{id}")
+ @Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult batchDelete(@PathVariable("id") Long id) {
+ return AjaxResult.success(processRouteItemService.batchDelete(id));
}
}
--
Gitblit v1.9.3