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/ProductWorkOrderController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
index f595d98..7e8e92c 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.pojo.QualityInspect;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
@RestController
@AllArgsConstructor
@@ -34,4 +38,28 @@
return R.ok(productWorkOrderservice.updateProductWorkOrder(productWorkOrderDto));
}
+ /**
+ * pda鏍规嵁浜岀淮鐮佺殑宸ュ崟id鏌ヨ鏁版嵁
+ */
+ @ApiOperation("pda鏍规嵁浜岀淮鐮佺殑宸ュ崟id鏌ヨ鏁版嵁")
+ @GetMapping("/getProductWorkOrderById")
+ public R getProductWorkOrderById(Long id) {
+ return R.ok(productWorkOrderservice.getById(id));
+ }
+
+ /**
+ * 宸ュ崟娴佽浆鍗′笅杞�
+ * @param response
+ * @param productWorkOrder
+ */
+ @PostMapping("/down")
+ public void down(HttpServletResponse response, @RequestBody ProductWorkOrder productWorkOrder) {
+ productWorkOrderservice.down(response, productWorkOrder);
+ }
+
+ @ApiOperation("鏍规嵁鐢熶骇璁㈠崟id鏌ヨ鏁版嵁")
+ @GetMapping("/getByProductOrderId/{productOrderId}")
+ public R getProductWorkOrderListByProductOrderId(@PathVariable Long productOrderId) {
+ return R.ok(productWorkOrderservice.getByProductOrderId(productOrderId));
+ }
}
--
Gitblit v1.9.3