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/production/controller/ProductInspectionRecordController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java b/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
index 4548b54..3c46227 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
@@ -10,6 +10,8 @@
import com.ruoyi.production.dto.ProductInspectionRecordDto;
import com.ruoyi.production.pojo.ProductInspectionRecord;
import com.ruoyi.production.service.ProductInspectionRecordService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +32,8 @@
public class ProductInspectionRecordController {
@Autowired
private ProductInspectionRecordService productInspectionRecordService;
+ @Autowired
+ private ISysUserService sysUserService;
@ApiOperation("宸℃璁板綍 鍒嗛〉鏌ヨ")
@GetMapping("listPage")
@@ -41,7 +45,21 @@
.between(Objects.nonNull(productInspectionRecord.getStartTime()) && Objects.nonNull(productInspectionRecord.getEndTime()),
ProductInspectionRecord::getInspectionTime, productInspectionRecord.getStartTime(),
productInspectionRecord.getEndTime());
- return AjaxResult.success(productInspectionRecordService.page(page, ew));
+ // 鏌ヨ鍒嗛〉鏁版嵁
+ Page<ProductInspectionRecord> resultPage = productInspectionRecordService.page(page, ew);
+
+ List<ProductInspectionRecord> records = resultPage.getRecords();
+ for (ProductInspectionRecord record : records) {
+ if (record.getCreateUser() != null) {
+ Long userId = record.getCreateUser().longValue();
+ SysUser user = sysUserService.selectUserById(userId);
+ if (user != null) {
+ record.setCreateUserName(user.getNickName());
+ }
+ }
+ }
+
+ return AjaxResult.success(resultPage);
}
@ApiOperation("宸℃璁板綍 鏂板")
--
Gitblit v1.9.3