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/quality/controller/QualityTestStandardController.java | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 770dea5..e82c196 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,15 +2,19 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
+import com.ruoyi.quality.service.QualityTestStandardParamService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Nonnull;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -27,6 +31,9 @@
@Resource
private IQualityTestStandardService qualityTestStandardService;
+
+ @Resource
+ private QualityTestStandardParamService qualityTestStandardParamService;
/**
@@ -49,17 +56,7 @@
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardService.removeBatchByIds(ids));
- }
-
- /**
- * 妫�娴嬫爣鍑嗕富琛ㄨ鎯�
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityTestStandardService.getById(id));
+ return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -85,12 +82,46 @@
/**
* 妫�娴嬫爣鍑嗗鍒跺弬鏁�
- * @param qualityTestStandardDto
+ * @param qualityTestStandard
* @return
*/
@PostMapping("/copyParam")
- public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
- return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
+ public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
+ }
+
+ /**
+ * 妫�娴嬫爣鍑嗘壒閲忓鏍�
+ * @param qualityTestStandards
+ * @return
+ */
+ @PostMapping("/qualityTestStandardAudit")
+ public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ }
+
+ /**
+ * 鏍规嵁浜у搧id鏌ヨ鐩稿叧鐨勬楠屾爣鍑�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardByProductId")
+ public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ }
+
+ /**
+ * 鏍规嵁妫�娴嬫爣鍑唅d鏌ヨ鐩稿叧鐨勬楠屾爣鍑嗗弬鏁�
+ * @return
+ */
+ @GetMapping("/getQualityTestStandardParamByTestStandardId")
+ public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ }
+
+ @ApiOperation("鏍规嵁 宸ュ簭鎴栫被鍒� 鏌ヨ瀵瑰簲鍙傛暟椤�")
+ @GetMapping("/getParameterItemByProcessOrCategory")
+ public AjaxResult delete(@RequestParam(required = false) Long id, Integer inspectType) {
+ return AjaxResult.success(qualityTestStandardService.getParameterItemByProcessOrCategory(id, inspectType));
}
}
--
Gitblit v1.9.3