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/service/impl/DocumentationServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
index 195bfce..5a7cf30 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
@@ -1,10 +1,13 @@
package com.ruoyi.warehouse.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
+import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.service.DocumentationService;
import com.ruoyi.warehouse.mapper.DocumentationMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +15,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author 86151
@@ -24,15 +29,85 @@
@Autowired
private DocumentationMapper documentationMapper;
@Override
- public IPage<Documentation> listPage(Page page, Documentation documentation) {
+ public IPage<DocumentationDto> listPage(Page page, Documentation documentation) {
return documentationMapper.listPage(page, documentation);
}
@Override
- public void export(HttpServletResponse response) {
- List<Documentation> list =documentationMapper.list();
- ExcelUtil<Documentation> util = new ExcelUtil<>(Documentation.class);
- util.exportExcel(response, list, "鏂囨。淇℃伅琛�");
+ public void export(HttpServletResponse response,Documentation documentation) {
+ IPage<DocumentationDto> list = documentationMapper.listPage(null, documentation);
+ ExcelUtil<DocumentationDto> util = new ExcelUtil<>(DocumentationDto.class);
+ util.exportExcel(response, list.getRecords(), "鏂囨。淇℃伅琛�");
+ }
+
+ @Override
+ public boolean deleteByIds(List<Long> ids) {
+ List<Documentation> documentationList = documentationMapper.selectList(new LambdaQueryWrapper<Documentation>().in(Documentation::getId, ids));
+ for (Documentation documentation : documentationList) {
+ //濡傛灉鏂囨。鐘舵�佹槸宸插�熷嚭锛屼笉鑳藉垹闄�
+ if ("鍊熷嚭".equals(documentation.getDocStatus()) || "浣滃簾".equals(documentation.getDocStatus())) {
+ throw new RuntimeException("褰撳墠鏂囨。鐘舵�佷负 " + documentation.getDocStatus() + "锛屼笉鏀寔鍒犻櫎");
+ }
+ documentationMapper.deleteById(documentation.getId());
+ }
+ return true;
+ }
+ /**
+ * 鍒楄〃鎵�鏈夋枃妗�
+ * @return
+ */
+ @Override
+ public List<DocumentationDto> listAll() {
+ List<DocumentationDto> list = documentationMapper.list().stream().filter(documentationDto -> "姝ｅ父".equals(documentationDto.getDocStatus())).collect(Collectors.toList());
+ return list;
+ }
+ /**
+ * 鑾峰彇鏂囨。鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer getTotalDocsCount() {
+ return documentationMapper.countTotalDocs();
+ }
+ /**
+ * 鑾峰彇鏂囨。鍒嗙被鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer getCategoryNumCount() {
+ return documentationMapper.countCategoryNum();
+ }
+ /**
+ * 鑾峰彇宸插�熷嚭鏂囨。鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer getBorrowedDocsCount() {
+ return documentationMapper.countBorrowedDocs();
+ }
+ /**
+ * 鑾峰彇姣忔湀鏂板鏂囨。鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer getMonthlyAddedDocsCount() {
+ return documentationMapper.countMonthlyAddedDocs();
+ }
+ /**
+ * 鑾峰彇鏂囨。鍒嗙被鍒嗗竷
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getCategoryDistribution() {
+ return documentationMapper.countCategoryDistribution();
+ }
+ /**
+ * 鑾峰彇鏂囨。鐘舵�佸垎甯�
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getStatusDistribution() {
+ return documentationMapper.countStatusDistribution();
}
}
--
Gitblit v1.9.3