From 4858d6a68446a5153749eca8fae8ae099ac879a2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 25 五月 2026 14:11:49 +0800
Subject: [PATCH] fix:1.销售从库存选
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 4 +++-
src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java | 5 +++++
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
index a17d163..89b0dd2 100644
--- a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -40,6 +42,9 @@
@ApiModelProperty(value = "鍗曚綅")
private String unit;
+ @ApiModelProperty(value = "鏁伴噺")
+ private BigDecimal qualitity;
+
@ApiModelProperty(value = "瀛愯妭鐐瑰垪琛�")
private List<FinishedProductTreeDto> children;
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 8707678..ceb7b20 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -101,6 +101,7 @@
leafNode.setVoltage(data.getVoltage());
leafNode.setMaterialCode(data.getMaterialCode());
leafNode.setUnit(data.getUnit());
+ leafNode.setQualitity(data.getQualitity());
productMap.get(productId).getChildren().add(leafNode);
}
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 4601f68..98b526b 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -523,7 +523,8 @@
si.process_category as processCategory,
si.voltage,
pm.material_code as materialCode,
- pm.unit
+ pm.unit,
+ si.qualitity as qualitity
from stock_inventory si
inner join product_model pm on si.product_model_id = pm.id
inner join product p on pm.product_id = p.id
@@ -541,6 +542,7 @@
<if test="ew.voltage != null and ew.voltage != ''">
and si.voltage = #{ew.voltage}
</if>
+ and si.qualitity > 0
</where>
order by p.id asc, pm.id asc, si.id asc
</select>
--
Gitblit v1.9.3