From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录
---
src/main/resources/mapper/production/ProductionOrderPickMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
index 8b0a0d7..1fa15c9 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
@@ -11,6 +11,7 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="production_order_id" property="productionOrderId" />
+ <result column="production_operation_task_id" property="productionOperationTaskId" />
<result column="remark" property="remark" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
@@ -24,19 +25,55 @@
<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,
- pm.unit as unit
+ <sql id="PickDetailColumns">
+ pop.id as id,
+ pop.product_model_id as productModelId,
+ pop.quantity as quantity,
+ pop.quantity as pickQuantity,
+ pop.batch_no as batchNo,
+ pop.create_time as createTime,
+ pop.update_time as updateTime,
+ pop.production_order_id as productionOrderId,
+ pop.production_operation_task_id as productionOperationTaskId,
+ pop.remark as remark,
+ pop.technology_operation_id as technologyOperationId,
+ pop.demanded_quantity as demandedQuantity,
+ pop.feeding_qty as feedingQty,
+ pop.return_qty as returnQty,
+ pop.actual_qty as actualQty,
+ pop.is_returned as returned,
+ pop.is_bom as bom,
+ coalesce(pop.operation_name, top1.name) as operationName,
+ p.product_name as productName,
+ pm.model as model,
+ pm.unit as unit,
+ pot.work_order_no as workOrderNo
+ </sql>
+
+ <sql id="PickDetailJoins">
from production_order_pick pop
- left join product_model pm on pop.product_model_id = pm.id
- left join product p on pm.product_id = p.id
+ left join product_model pm on pop.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_operation top1 on pop.technology_operation_id = top1.id
+ left join production_operation_task pot on pop.production_operation_task_id = pot.id
+ </sql>
+
+ <!-- 璁㈠崟绾ч鏂欐眹鎬伙細鍖呭惈璇ヨ鍗曚笅鎵�鏈夊伐搴忕殑棰嗘枡璁板綍 -->
+ <select id="listPickedDetailByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
+ select
+ <include refid="PickDetailColumns" />
+ <include refid="PickDetailJoins" />
where pop.production_order_id = #{productionOrderId}
order by pop.create_time desc, pop.id desc
</select>
+ <!-- 宸ュ簭锛堝伐鍗曪級绾ч鏂欒褰� -->
+ <select id="listPickedDetailByTaskId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
+ select
+ <include refid="PickDetailColumns" />
+ <include refid="PickDetailJoins" />
+ where pop.production_operation_task_id = #{productionOperationTaskId}
+ order by pop.create_time desc, pop.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3