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/safe/service/impl/SafeTrainingServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
index 0179898..05f1ae7 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -67,7 +67,7 @@
@Override
public int addOrUpdate(SafeTraining safeTraining) {
if (ObjectUtils.isNull(safeTraining.getId())) {
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
+ String datePrefix ="KC-"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
// 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶ц绋嬬紪鍙�
QueryWrapper<SafeTraining> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("course_code", datePrefix)
@@ -87,7 +87,7 @@
}
}
// 鐢熸垚瀹屾暣鐨勮绋嬬紪鍙�
- String no = "KC-" + String.format("%s%03d", datePrefix, sequenceNumber);
+ String no = String.format("%s%03d", datePrefix, sequenceNumber);
safeTraining.setCourseCode(no);
}
//鏍规嵁鏃堕棿鍒ゆ柇鍩硅鐘舵��
@@ -115,10 +115,14 @@
SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
//闄勪欢
List<SafeTrainingFile> safeTrainingFiles = safeTrainingFileMapper.selectList(Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId, id));
- safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+ if (safeTrainingFiles.size()>0){
+ safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+ }
//鍩硅璁板綍璇︽儏
List<SafeTrainingDetailsDto> safeTrainingDetailsDto = safeTrainingDetailsMapper.getSafeTraining(id);
- safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+ if (safeTrainingDetailsDto.size()>0) {
+ safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+ }
return safeTrainingDto;
}
--
Gitblit v1.9.3