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/mapper/QualityUnqualifiedMapper.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
index b9f462f..4401332 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityUnqualified;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -13,22 +12,21 @@
@Mapper
public interface QualityUnqualifiedMapper extends BaseMapper<QualityUnqualified> {
-
IPage<QualityUnqualified> qualityUnqualifiedListPage(Page page, @Param("qualityUnqualified") QualityUnqualified qualityUnqualified);
List<QualityUnqualified> qualityUnqualifiedExport(@Param("qualityUnqualified") QualityUnqualified qualityUnqualified);
QualityUnqualified getUnqualified(@Param("id") Integer id);
- //鎵嬪姩鏂板涓嶅悎鏍肩殑鏃跺��,鏍规嵁浜у搧鍚嶇О鍜岃鏍煎瀷鍙锋煡鍑哄搴旂殑瑙勬牸鍨嬪彿id
+ // 鎵嬪姩鏂板涓嶅悎鏍兼椂锛屾牴鎹骇鍝佸悕绉板拰瑙勬牸鍨嬪彿鏌ヨ瀵瑰簲鐨勪骇鍝佸瀷鍙� ID
Long getModelId(@Param("productName") String productName, @Param("model") String model);
-
- //鏍规嵁宸ュ簭鍚嶇О鍒楄〃鏌ヨ琚殧绂荤殑涓嶅悎鏍艰褰�
- List<QualityUnqualified> selectUnqualifiedByProcessNames(@Param("processNames") List<String> processNames);
+
+ // 鏍规嵁鐢熶骇璁㈠崟鍜屽墠搴忓伐搴忓悕绉板垪琛ㄦ煡璇㈡湭瑙ｉ櫎闅旂鐨勪笉鍚堟牸璁板綍
+ List<QualityUnqualified> selectUnqualifiedByProductOrderAndProcessNames(@Param("productOrderId") Long productOrderId,
+ @Param("processNames") List<String> processNames);
/**
- * 鏌ヨ涓嶅悎鏍艰褰曠殑鐢熶骇璁㈠崟淇℃伅
- * @return
+ * 鏌ヨ涓嶅悎鏍艰褰曞叧鑱旂殑鐢熶骇璁㈠崟淇℃伅銆�
*/
List<QualityUnqualified> selectUnqualifiedWithProductionOrder();
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3