廖井涛
2025-08-12 07aad9ee40befc60e1e6e231ec36b98bff294796
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -936,11 +936,11 @@
            ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
            od.width,
            od.height,
            fol.quantity,
            sum(fol.quantity) as quantity,
            od.product_name,
            od.product_id,
            ROUND( od.width * od.height * fol.quantity / 1000000, 2 ) as area,
            ROUND( od.width * od.height * fol.quantity / 1000000, 2 )*#{thickness}*2.5 as weight
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )*#{thickness}*2.5 as weight
        FROM
            ( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '入库' AND aa.STATUS != '已作废' ) fol
                LEFT JOIN sd.order_detail od ON fol.order_id = od.order_id
@@ -948,6 +948,7 @@
                LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
        WHERE
            o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
        group by od.order_id,od.order_number
        ORDER BY
            fol.operate_time DESC