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/ProductProcessRouteItemController.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
index 66ace47..2d5231d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
@@ -1,34 +1,78 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.dto.ProductProcessRouteItemDto;
-import com.ruoyi.production.pojo.ProcessRouteItem;
-import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductProcessRouteItemService;
+import com.ruoyi.production.service.ProductProcessRouteService;
+import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-@RequestMapping("productProcessRoute")
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RequestMapping("/productProcessRoute")
@RestController
+@AllArgsConstructor
@Api(tags = "鐢熶骇宸ヨ壓璺嚎")
public class ProductProcessRouteItemController {
- @Autowired
+
+
private ProductProcessRouteItemService productProcessRouteItemService;
+ private ProductProcessRouteService productProcessRouteService;
@GetMapping("list")
- @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓椤圭洰")
+ @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎瀛愯〃")
public R list(Long orderId) {
return R.ok(productProcessRouteItemService.listItem(orderId));
}
- @PostMapping ()
- @ApiOperation("鏂板淇敼")
- public R addOrUpdate(@RequestBody ProductProcessRouteItemDto processRouteItemDto) {
- productProcessRouteItemService.remove(new QueryWrapper<ProductProcessRouteItem>().lambda().eq(ProductProcessRouteItem::getRouteId, processRouteItemDto.getRouteId()));
- return R.ok(productProcessRouteItemService.saveBatch(processRouteItemDto.getProcessRouteItem()));
+ @GetMapping("listMain")
+ @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎涓昏〃")
+ public R listMain(Long orderId) {
+ return R.ok(productProcessRouteService.listMain(orderId));
+ }
+
+ @PostMapping("/addRouteItem")
+ @ApiOperation("鏂板鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ public R addRouteItem(@RequestBody ProductProcessRouteItem productProcessRouteItem) {
+ return productProcessRouteItemService.addRouteItem(productProcessRouteItem);
+ }
+
+ @PostMapping("/updateRouteItem")
+ @ApiOperation("淇敼鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ public R updateRouteItem(@RequestBody ProductProcessRouteItem productProcessRouteItem) {
+ return R.ok(productProcessRouteItemService.updateById(productProcessRouteItem));
+ }
+
+ @DeleteMapping("/deleteRouteItem/{id}")
+ @ApiOperation("鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
+ public R deleteRouteItem(@PathVariable("id") Long id) {
+ return productProcessRouteItemService.deleteRouteItem(id);
+ }
+
+ @PostMapping ("/sortRouteItem")
+ @ApiOperation("鎺掑簭")
+ public R sortRouteItem(@RequestBody ProductProcessRouteItem productProcessRouteItem) {
+ return R.ok(productProcessRouteItemService.sortRouteItem(productProcessRouteItem));
}
}
--
Gitblit v1.9.3