From 02a98973275c0c792e5fefdacdbea272b053f886 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 11:06:00 +0800
Subject: [PATCH] feat:1.补料和补料记录 2.退料
---
src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
index 818f4d9..4614ef7 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
@@ -15,6 +15,7 @@
<result column="after_quantity" property="afterQuantity" />
<result column="pick_type" property="pickType" />
<result column="remark" property="remark" />
+ <result column="feeding_reason" property="feedingReason" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="create_user" property="createUser" />
@@ -36,4 +37,24 @@
order by popr.create_time desc, popr.id desc
</select>
+ <select id="listFeedingRecord" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickRecordVo">
+ select popr.*,
+ poro.operation_name as operationName,
+ p.product_name as productName,
+ pm.model as model,
+ pm.unit as unit,
+ coalesce(su.nick_name, su.user_name) as supplementUserName,
+ popr.create_time as supplementTime
+ from production_order_pick_record popr
+ left join production_operation_task pot on popr.production_operation_task_id = pot.id
+ left join production_order_routing_operation poro on pot.technology_routing_operation_id = poro.id
+ left join product_model pm on popr.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join sys_user su on popr.create_user = su.user_id
+ where popr.production_order_id = #{productionOrderId}
+ and popr.pick_id = #{pickId}
+ and popr.pick_type = 2
+ order by popr.create_time desc, popr.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3