From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/resources/mapper/production/ProductionOrderPickMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
index c4b11f8..8b0a0d7 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
@@ -14,6 +14,29 @@
<result column="remark" property="remark" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
+ <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,
+ pm.unit as unit
+ 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
+ where pop.production_order_id = #{productionOrderId}
+ order by pop.create_time desc, pop.id desc
+ </select>
+
</mapper>
--
Gitblit v1.9.3