guoyujie
2025-12-04 eba3314826d53ff0f7e5679d185baaff84e50354
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -124,6 +124,7 @@
        <result column="height" property="orderDetail.shape"/>
        <result column="contract_id" property="order.contractId"/>
        <result column="batch" property="order.batch"/>
@@ -292,7 +293,7 @@
            </if>
        </where>
        order by dd.id
        order by dd.box_no,dd.order_id,dd.order_number
    </select>
    <select id="getSelectShippingOrderDetailPageTotal">
@@ -1049,7 +1050,7 @@
    <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
        select dd.delivery_id,od.order_id,od.product_id,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as product_name,dd.price,sum(dd.area) as area,
               sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id from
               sum(dd.money) as money,sum(dd.quantity) as quantity,o.contract_id,o.batch from
        delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
                                                            left join product pt on pt.id=od.product_id
                                                            left join sd.`order` o on o.order_id=dd.order_id