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/ProductionProductMainMapper.xml | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index e9200b9..8dd4613 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -30,19 +30,27 @@
p.product_name as productName,
pm.model as productModelName,
pm.unit,
- sl.sales_contract_no as salesContractNo,
+ po_sales.salesContractNo,
date(ppm.create_time) as schedulingDate,
su.nick_name as schedulingUserName,
- sl.customer_name as customerName,
- top2.name as process
+ po_sales.customerName,
+ poro.operation_name as process
from production_product_main ppm
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
- left join sales_ledger sl on po.sales_ledger_id = sl.id
- left join product_model pm on po.product_model_id = pm.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join (
+ select po2.id as orderId,
+ group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
+ group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName
+ from production_order po2
+ left join production_plan pp2
+ on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
+ group by po2.id
+ ) po_sales on po_sales.orderId = po.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
left join product p on pm.product_id = p.id
- left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
- left join technology_operation top2 on tro.technology_operation_id = top2.id
left join sys_user su on ppm.create_user = su.user_id
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
<where>
@@ -53,10 +61,10 @@
and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
</if>
<if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no like concat('%', #{c.salesContractNo}, '%')
+ and po_sales.salesContractNo like concat('%', #{c.salesContractNo}, '%')
</if>
<if test="c.customerName != null and c.customerName != ''">
- and sl.customer_name like concat('%', #{c.customerName}, '%')
+ and po_sales.customerName like concat('%', #{c.customerName}, '%')
</if>
<if test="c.productName != null and c.productName != ''">
and p.product_name like concat('%', #{c.productName}, '%')
@@ -65,10 +73,13 @@
and pm.model like concat('%', #{c.productModelName}, '%')
</if>
<if test="c.process != null and c.process != ''">
- and top2.name like concat('%', #{c.process}, '%')
+ and poro.operation_name like concat('%', #{c.process}, '%')
</if>
<if test="c.schedulingDate != null">
and date(ppm.create_time) = #{c.schedulingDate}
+ </if>
+ <if test="c.productMainId != null">
+ and ppm.id = #{c.productMainId}
</if>
</where>
order by ppm.create_time desc
@@ -84,16 +95,15 @@
p.product_name as productName,
pm.model as productModelName,
pm.unit,
- top2.name as process,
+ poro.operation_name as process,
ifnull(ppo.quantity, 0) as quantity,
ifnull(ppo.scrap_qty, 0) as scrapQty
from production_product_main ppm
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
left join production_order po on pot.production_order_id = po.id
- left join product_model pm on po.product_model_id = pm.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
left join product p on pm.product_id = p.id
- left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
- left join technology_operation top2 on tro.technology_operation_id = top2.id
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
order by ppm.create_time desc
</select>
--
Gitblit v1.9.3