From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/resources/mapper/production/ProductionOrderMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 1a304ef..35a7941 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -54,7 +54,9 @@
tr.process_route_code as processRouteCode,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
tb.bom_no as bomNo,
- pop_return.returned as returned
+ pop_return.returned as returned,
+ t7.name as workshop_name,
+ t7.id as workshop_id
</sql>
<sql id="ProductionOrderVoFrom">
@@ -81,6 +83,8 @@
from production_order_pick
group by production_order_id
) pop_return on pop_return.productionOrderId = po.id
+ left join workshop as t7 on po.workshop_id = t7.id
+
</sql>
<sql id="ProductionOrderWhere">
@@ -125,6 +129,9 @@
<if test="c.endTime != null">
and po.end_time <= #{c.endTime}
</if>
+ <if test="c.workshopId != null">
+ and t7.id = #{c.workshopId}
+ </if>
</if>
</where>
</sql>
--
Gitblit v1.9.3