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/purchase/PurchaseReturnOrdersMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 8976a3a..0232873 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -23,17 +23,26 @@
SELECT
pro.*,
sm.supplier_name as supplierName,
- pl.purchase_contract_number as purchaseContractNumber,
- su.user_name as returnUserName,
- su1.user_name as createUserName
+ pl.purchase_contract_number as purchaseContractNumber
FROM purchase_return_orders pro
LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
- LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
- LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_id
where 1=1
<if test="params.no != null and params.no != '' ">
AND pro.no LIKE CONCAT('%',#{params.no},'%')
</if>
+ <if test="params.deptId != null">
+ AND pro.dept_id = #{params.deptId}
+ </if>
+ <if test="params.deptIds != null and params.deptIds.length > 0">
+ AND pro.dept_id IN
+ <foreach collection="params.deptIds" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ <if test="params.createUser != null">
+ AND pro.create_user = #{params.createUser}
+ </if>
+ ORDER BY pro.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3