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/safe/service/impl/SafeTrainingServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 fbf234b..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);
}
//鏍规嵁鏃堕棿鍒ゆ柇鍩硅鐘舵��
--
Gitblit v1.9.3