From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 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 cf1efd4..5a7cf30 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
@@ -15,6 +15,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author 86151
@@ -27,15 +29,15 @@
@Autowired
private DocumentationMapper documentationMapper;
@Override
- public List<DocumentationDto> listPage(Page page, Documentation documentation) {
+ public IPage<DocumentationDto> listPage(Page page, Documentation documentation) {
return documentationMapper.listPage(page, documentation);
}
@Override
public void export(HttpServletResponse response,Documentation documentation) {
- List<DocumentationDto> list = documentationMapper.listPage(null, documentation);
+ IPage<DocumentationDto> list = documentationMapper.listPage(null, documentation);
ExcelUtil<DocumentationDto> util = new ExcelUtil<>(DocumentationDto.class);
- util.exportExcel(response, list, "鏂囨。淇℃伅琛�");
+ util.exportExcel(response, list.getRecords(), "鏂囨。淇℃伅琛�");
}
@Override
@@ -50,6 +52,63 @@
}
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