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/production/ProductWorkOrderMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index afd2bde..9dc639f 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,10 +21,15 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ po.batch_no as batchNo,
+ pp.id as processId,
pp.NAME as processName,
+ pp.qualified_rate as processQualifiedRate,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name AS productName,
+ p.id AS productId,
po.nps_no AS productOrderNpsNo,
ppri.drag_sort,
ppri.product_route_id,
@@ -50,7 +55,46 @@
<if test="c.productOrderId != null and c.productOrderId != ''">
and pwo.product_order_id = #{c.productOrderId}
</if>
- order by pwo.priority
+ <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+ and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
+ </if>
+ <if test="c.processName != null and c.processName != ''">
+ and pp.NAME like concat('%',#{c.processName},'%')
+ </if>
+ order by pwo.priority asc, po.id desc, ppri.drag_sort asc
+ </select>
+
+ <select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ SELECT
+ pwo.*,
+ pp.id as processId,
+ pp.NAME as processName,
+ pp.no as processNo,
+ pm.model,
+ pm.unit,
+ p.product_name AS productName,
+ po.nps_no AS productOrderNpsNo,
+ ppri.drag_sort,
+ ppri.product_route_id,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+ CASE
+ WHEN pwo.complete_quantity >= pwo.plan_quantity THEN '宸茬敓浜�'
+ WHEN pwo.complete_quantity > 0 AND pwo.complete_quantity < pwo.plan_quantity THEN '鐢熶骇涓�'
+ ELSE '寰呯敓浜�'
+ END AS statusText,
+ CASE
+ WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
+ ELSE '姝ｅ父'
+ END AS work_order_type
+ FROM
+ product_work_order pwo
+ LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ LEFT JOIN product_process pp ON pp.id = ppri.process_id
+ LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
+ LEFT JOIN product p ON p.id = pm.product_id
+ where po.id=#{productOrderId}
+ order by ppri.drag_sort
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
@@ -98,4 +142,4 @@
limit 1
;
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3