From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能

---
 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