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/QualityUnqualifiedController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index b1a5a1b..456bdc6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -2,11 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityUnqualified;
-import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,6 +28,7 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
+ qualityUnqualified.setInspectState(0);
return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
}
@@ -41,9 +39,11 @@
*/
@DeleteMapping("/del")
public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
+ qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
+ if (qualityUnqualified.getInspectState()==1){
+ throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
+ }
+ });
return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
@@ -53,8 +53,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ public AjaxResult QualityUnqualifiedDetail(@PathVariable Integer id) {
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -88,5 +88,29 @@
qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
}
+ /**
+ * 涓嶅悎鏍肩鐞嗗鐞�
+ * @param qualityUnqualified
+ * @return
+ */
+ @PostMapping("/deal")
+ public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
+ }
+
+ /**
+ * 鍙栨秷闅旂
+ * @param qualityUnqualified
+ * @return
+ */
+ @PostMapping("/liftTheQuarantine")
+ public AjaxResult liftTheQuarantine(@RequestBody QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.liftTheQuarantine(qualityUnqualified));
+ }
+
+ @GetMapping("/withProductionOrder")
+ public AjaxResult findUnqualifiedWithProductionOrder() {
+ return AjaxResult.success(qualityUnqualifiedService.findUnqualifiedWithProductionOrder());
+ }
}
--
Gitblit v1.9.3