Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-21 b8982b86a15d186c4cf6144fface700d9769fa95

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -68,7 +68,8 @@
        b.customer_name,
        if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status,
        a.merge,
        a.rack
        a.rack,
        b.batch
        from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,max(merge) as merge,rack from flow_card
        group by process_Id,order_number) as a
        left join sd.`order` as b on a.order_Id=b.order_id
@@ -207,26 +208,36 @@

    <!--    分架明细查询-->
    <select id="detailsSelectMp">
        select od.order_id,
               ogd.production_id,
               od.product_id,
               od.product_name,
               ROUND(SUM(od.quantity)-IFNULL(sum(fc.quantity)/count(fc.technology_number),0))            as quantity,
               SUM(od.compute_gross_area)  as compute_gross_area,
               round(sum(od.perimeter), 2) as perimeter
        from sd.order_detail as od
                 left join
             (select order_id, order_number,technology_number, production_id, splitting_status
              from sd.order_glass_detail
              GROUP BY order_id, order_number) as ogd
             on od.order_id = ogd.order_id and od.order_number = ogd.order_number
                 left join flow_card as fc on fc.order_id = od.order_id and fc.order_number = od.order_number
            and fc.technology_number=ogd.technology_number
        where od.order_id = #{orderId}
          and ogd.splitting_status = 0
        SELECT
            od.order_id,
            ogd.production_id,
            od.product_id,
            od.product_name,
            ROUND(SUM(od.quantity) - IFNULL(SUM(fc.quantity) / fc.layers_number, 0)) AS quantity,
            SUM(od.compute_gross_area) AS compute_gross_area,
            ROUND(SUM(od.perimeter), 2) AS perimeter
        FROM sd.order_detail AS od
                 LEFT JOIN (
            SELECT order_id, order_number, production_id, splitting_status,
                   technology_number
            FROM sd.order_glass_detail
            GROUP BY order_id, order_number, production_id, splitting_status
        ) AS ogd
                           ON od.order_id = ogd.order_id
                               AND od.order_number = ogd.order_number
                 LEFT JOIN (
            SELECT order_id, order_number, technology_number, SUM(quantity) AS quantity, layers_number
            FROM flow_card
            GROUP BY order_id, order_number, technology_number
        ) AS fc
                           ON fc.order_id = od.order_id
                               AND fc.order_number = od.order_number
                               AND fc.technology_number = ogd.technology_number
        WHERE od.order_id = #{orderId}
          AND ogd.splitting_status = 0
        GROUP BY od.order_id, ogd.production_id, od.product_id, od.product_name
        ORDER BY od.order_id DESC;

        group by od.order_id, ogd.production_id
        order by od.id desc
    </select>

    <!--    更新分架状态-->
@@ -272,7 +283,7 @@
               od.quantity,
               od.compute_gross_area,
               p.total_thickness,
               ROUND(od.quantity-IFNULL(sum(fc.quantity)/count(fc.technology_number),0))           as baiscQuantity,
               ROUND(od.quantity-IFNULL(sum(fc.quantity)/fc.layers_number,0))           as baiscQuantity,
               od.compute_gross_area as 'computeGrossArea',
               p.total_thickness     AS 'totalThickness',
               ifnull(p.thickness,'') as thickness,
@@ -289,7 +300,7 @@
        from sd.order_detail as od
                 left join sd.order_glass_detail as ogd
                           on od.order_id = ogd.order_id and od.order_number = ogd.order_number
                 left join sd.product as p on od.product_name = p.product_name
                 left join sd.product as p on od.product_id = p.id
                 left join (SELECT order_id,
                                   order_number,
                                   JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S01')) AS S01,
@@ -2899,13 +2910,28 @@
    
    <select id="getOrderDetailByProductionId">
        select * from (select a.*,
                              a.quantity as 'baiscQuantity',
                              #{glassThickness} as 'thickness',
        IF(a.height >= a.width, a.height, a.width) as 'long',
        IF(a.height &lt; a.width, a.height, a.width) as 'short'
        from sd.order_detail as a
        left join sd.order_glass_detail as b
        on a.order_id = b.order_id and a.order_number = b.order_number
        where a.order_id = #{orderId} and b.production_id = #{productionId}

        group by a.order_number) as c
        <if test="type=='scope'">
            where  c.`long` &lt;= #{inLenMax}
                and c.`long` >= #{inLenMin}
                and c.`short` >= #{inShortMin}
                and c.`short` &lt;= #{inShortMax}
        </if>
        <if test="type=='notScope'">
            where  !(c.`long` &lt;= #{inLenMax}
            and c.`long` >= #{inLenMin}
            and c.`short` >= #{inShortMin}
            and c.`short` &lt;= #{inShortMax})
        </if>
        order by c.`long` desc
    </select>

@@ -3031,4 +3057,8 @@
        where process_id = #{processId}
          and order_number = #{orderNumber}
    </select>

    <select id="getOrderIdByProcessId">
        select order_id from pp.flow_card  where process_id = #{processId} limit 1;
    </select>
</mapper>