huminmin
2026-05-14 beddea151f8995d56efa0e133ddfa4e567f5a671
src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -27,6 +27,8 @@
        <result column="productName" property="productName" />
        <result column="model" property="model" />
        <result column="processRouteCode" property="processRouteCode" />
        <result column="returned" property="returned" />
        <result column="teamLeaderUserName" property="teamLeaderUserName" />
    </resultMap>
    <sql id="ProductionOrderVoColumns">
@@ -45,13 +47,17 @@
        po.dept_id,
        po.plan_complete_time,
        po.status,
        po.team_leader_user_id,
        sl_user.nick_name as teamLeaderUserName,
        po_sales.salesContractNo,
        po_sales.customerName,
        p.product_name as productName,
        pm.model as model,
        po.is_end_order as endOrder,
        tr.process_route_code as processRouteCode,
        ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
        tb.bom_no as bomNo
        tb.bom_no as bomNo,
        pop_return.returned as returned
    </sql>
    <sql id="ProductionOrderVoFrom">
@@ -72,6 +78,13 @@
                 left join product p on pm.product_id = p.id
                 left join technology_routing tr on po.technology_routing_id = tr.id
                 left join technology_bom tb on tb.id = tr.bom_id
                 left join sys_user sl_user on sl_user.user_id = po.team_leader_user_id
                 left join (
            select production_order_id as productionOrderId,
                   if(max(case when ifnull(is_returned, 0) = 1 then 1 else 0 end) = 1, true, false) as returned
            from production_order_pick
            group by production_order_id
        ) pop_return on pop_return.productionOrderId = po.id
    </sql>
    <sql id="ProductionOrderWhere">