Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

 src/main/resources/mapper/production/ProductionOrderMapper.xml

@@ -27,6 +27,7 @@
        <result column="productName" property="productName" />
        <result column="model" property="model" />
        <result column="processRouteCode" property="processRouteCode" />
        <result column="returned" property="returned" />
    </resultMap>

    <sql id="ProductionOrderVoColumns">
@@ -52,7 +53,10 @@
        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,
        t7.name as workshop_name,
        t7.id as workshop_id
    </sql>

    <sql id="ProductionOrderVoFrom">
@@ -73,6 +77,14 @@
                 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 (
            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
                left join workshop as t7 on po.workshop_id = t7.id

    </sql>

    <sql id="ProductionOrderWhere">
@@ -117,6 +129,9 @@
                <if test="c.endTime != null">
                    and po.end_time &lt;= #{c.endTime}
                </if>
                <if test="c.workshopId != null">
                    and t7.id = #{c.workshopId}
                </if>
            </if>
        </where>
    </sql>