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/production/controller/ProductInspectionRecordController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 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 0ac5c53..3c46227 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
@@ -3,17 +3,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
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.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -28,13 +32,34 @@
public class ProductInspectionRecordController {
@Autowired
private ProductInspectionRecordService productInspectionRecordService;
+ @Autowired
+ private ISysUserService sysUserService;
@ApiOperation("宸℃璁板綍 鍒嗛〉鏌ヨ")
@GetMapping("listPage")
@Log(title = "宸℃璁板綍 鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult page(ProductInspectionRecordDto productInspectionRecord, Page<ProductInspectionRecord> page) {
LambdaQueryWrapper<ProductInspectionRecord> ew = Wrappers.<ProductInspectionRecord>lambdaQuery();
- return AjaxResult.success(productInspectionRecordService.page(page, ew));
+ ew.eq(StringUtils.isNotEmpty(productInspectionRecord.getProcess()), ProductInspectionRecord::getProcess, productInspectionRecord.getProcess())
+ .eq(StringUtils.isNotEmpty(productInspectionRecord.getProcessId()), ProductInspectionRecord::getProcessId, productInspectionRecord.getProcessId())
+ .between(Objects.nonNull(productInspectionRecord.getStartTime()) && Objects.nonNull(productInspectionRecord.getEndTime()),
+ ProductInspectionRecord::getInspectionTime, productInspectionRecord.getStartTime(),
+ productInspectionRecord.getEndTime());
+ // 鏌ヨ鍒嗛〉鏁版嵁
+ 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("宸℃璁板綍 鏂板")
@@ -61,4 +86,12 @@
productInspectionRecordService.removeBatchByIds(ids);
return AjaxResult.success();
}
+
+ @ApiOperation("宸℃璁板綍 閫氱煡")
+ @PostMapping("/notify")
+ @Log(title = "宸℃璁板綍 閫氱煡", businessType = BusinessType.OTHER)
+ public AjaxResult notify(@RequestBody List<Long> ids) {
+ productInspectionRecordService.notify(ids);
+ return AjaxResult.success("鍙戦�侀�氱煡鎴愬姛");
+ }
}
--
Gitblit v1.9.3