From 56b8b84689ccf5389ee02814bcb8bfe407f05a87 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 11:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionOrderPickMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
index 7dd8a1f..8b0a0d7 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
@@ -17,12 +17,17 @@
<result column="operation_name" property="operationName" />
<result column="technology_operation_id" property="technologyOperationId" />
<result column="demanded_quantity" property="demandedQuantity" />
+ <result column="feeding_qty" property="feedingQty" />
+ <result column="return_qty" property="returnQty" />
+ <result column="actual_qty" property="actualQty" />
+ <result column="is_returned" property="returned" />
<result column="is_bom" property="bom" />
</resultMap>
<select id="listPickedDetailByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
select pop.*,
pop.is_bom as bom,
+ pop.is_returned as returned,
pop.quantity as pickQuantity,
p.product_name as productName,
pm.model as model,
--
Gitblit v1.9.3