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/warehouse/controller/DocumentationBorrowManagementController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 0575729..fdf07fd 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -10,7 +10,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
+import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
+import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
import com.ruoyi.warehouse.service.WarehouseService;
@@ -32,11 +34,31 @@
private DocumentationBorrowManagementService documentationBorrowManagementService;
@Autowired
private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+ @Autowired
+ private DocumentationReturnManagementMapper documentationReturnManagementMapper;
@GetMapping("/listPage")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
+ }
+ @GetMapping("/list")
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult list() {
+ return AjaxResult.success(documentationBorrowManagementService.listAll());
+ }
+ @GetMapping("/listPageReturn")
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
+ }
+ @GetMapping("/getByDocumentationId/{id}")
+ @ApiOperation("鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
+ @Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
+ public AjaxResult getByDocumentationId(@PathVariable Long id) {
+ return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@@ -47,14 +69,20 @@
@PutMapping("/revent")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
- public AjaxResult reventdbm(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationBorrowManagement));
+ public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
}
@PutMapping("/update")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
+ }
+ @PutMapping("/reventUpdate")
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
+ public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
}
@DeleteMapping ("/delete")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@@ -79,10 +107,7 @@
@PostMapping("/exportrevent")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
- public void exportrevent(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.exportrevent(response,documentationBorrowManagement);
-// List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, "褰掕繕"));
-// ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
-// util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+ public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+ documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
}
}
--
Gitblit v1.9.3