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/resources/mapper/quality/QualityTestStandardMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
index cd3fb66..5c20733 100644
--- a/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
+++ b/src/main/resources/mapper/quality/QualityTestStandardMapper.xml
@@ -13,10 +13,10 @@
         <if test="c.standardName != null and c.standardName != '' ">
             AND standard_name like concat('%',#{c.standardName},'%')
         </if>
-        <if test="c.state != null and c.state != '' ">
+        <if test="c.state != null ">
             AND state =#{c.state}
         </if>
-        <if test="c.inspectType != null and c.inspectType != '' ">
+        <if test="c.inspectType != null ">
             AND inspect_type =#{c.inspectType}
         </if>
     </select>
@@ -30,5 +30,6 @@
         <if test="process!='' and process!=null">
             and pp.name = #{process}
         </if>
+        order by qts.id desc
     </select>
 </mapper>

--
Gitblit v1.9.3