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/ProductOrderController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 15a7ca6..baebd18 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -1,18 +1,24 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductOrderService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-@RequestMapping("productOrder")
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RequestMapping("/productOrder")
@RestController
+@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@Autowired
@@ -20,11 +26,50 @@
@ApiOperation("鍒嗛〉鏌ヨ")
- @GetMapping("page")
+ @GetMapping("/page")
public R page(ProductOrderDto productOrder, Page page) {
return R.ok(productOrderService.pageProductOrder(page, productOrder));
}
+ @ApiOperation("缁戝畾宸ヨ壓璺嚎")
+ @PostMapping("/bindingRoute")
+ public R bindingRoute(@RequestBody ProductOrder productOrder) {
+ return R.ok(productOrderService.bindingRoute(productOrder));
+ }
+
+ @ApiOperation("鏌ヨ瑙勬牸鍨嬪彿瀵瑰簲鐨勫伐鑹鸿矾绾�")
+ @GetMapping("/listProcessRoute")
+ public R listProcessRoute(Long productModelId) {
+ return R.ok(productOrderService.listProcessRoute(productModelId));
+ }
+
+ /**
+ * 瀵煎嚭鐢熶骇璁㈠崟
+ */
+ @Log(title = "鐢熶骇璁㈠崟", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ProductOrderDto productOrderDto) {
+ List<ProductOrderDto> list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
+ ExcelUtil<ProductOrderDto> util = new ExcelUtil<>(ProductOrderDto.class);
+ util.exportExcel(response, list, "鐢熶骇璁㈠崟鏁版嵁");
+ }
+
+ @ApiOperation("鏌ヨ鐢熶骇璁㈠崟瀵瑰簲鐨凚OM")
+ @GetMapping("/listProcessBom")
+ public R listProcessBom(Long orderId) {
+ return R.ok(productOrderService.listProcessBom(orderId));
+ }
+ @ApiOperation("鏂板鐢熶骇璁㈠崟")
+ @PostMapping("/addProductOrder")
+ public R addProductOrder(@RequestBody ProductOrderDto productOrderDto) {
+ return R.ok(productOrderService.addProductOrder(productOrderDto));
+ }
+
+ @ApiOperation("鍒犻櫎鐢熶骇璁㈠崟")
+ @DeleteMapping("/{ids}")
+ public R delete(@PathVariable("ids") Long[] ids) {
+ return R.ok(productOrderService.delete(ids));
+ }
}
--
Gitblit v1.9.3