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

廖井涛

2024-07-01 50efd9f19463da742e8c7b751bb4ab2c97acbf61

 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -34,6 +34,7 @@

        <result column="batch" property="order.batch"/>
        <result column="t_quantity" property="order.quantity"/>
        <result column="calculate_type" property="order.calculateType"/>


        <result column="customer_id" property="delivery.customerId"/>
@@ -149,9 +150,9 @@
        insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
        values (
                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeGrossArea},
                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
                #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
                #{orderDetail.price}*#{orderDetail.deliveryDetail.quantity},'',1,#{orderDetail.otherColumns},now()
                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
               )
    </insert>

@@ -351,6 +352,7 @@
        select od.order_id,
               od.order_number,
               o.batch,
               o.calculate_type,
               fgi.quantity_available,
               od.quantity- od.delivery_num as t_quantity,
               od.quantity as o_quantity,
@@ -885,10 +887,21 @@
        group by od.order_id,od.product_name,od.product_id
    </select>

    <select id="getSelectOrderPrinting"  >
        select od.order_id,od.product_id,od.product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
         order_detail od
        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
                and od.order_id like concat('%',#{orderDetail.orderId},'%')
            </if>
        </where>
        group by od.product_name,od.product_id
    </select>

    <select id="getSelectDeliveryDetailPrinting" >
        select od.order_id,
               od.order_number,
               od.product_name,
               p.remarks as product_name,
               od.width,
               od.height,
               dd.quantity,
@@ -896,11 +909,99 @@
               dd.area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
               od.price,
               od.other_columns
        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 p on od.product_id = p.id
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
          and od.product_id = #{productId}
    </select>

    <select id="getSelectotherMoney" >
        select bom.alias,oom.price,#{value} as count,oom.price*#{value} as monery
        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 order_other_money oom on oom.order_id=dd.order_id  and oom.column=#{key}
        left join basic_other_money bom on bom.`column`=oom.`column`
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
    </select>

    <select id="getSelectOrderDetailPrinting" >
        select od.order_id,
               od.order_number,
               od.product_name,
               od.width,
               od.height,
               od.quantity,
               od.gross_amount,
               od.compute_gross_area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}
    </select>


    <select id="exportDeliveryDetailReport">
        select dd.id,
            dd.delivery_id,
        dd.delivery_number,
        d.payment_terms,
        d.project,
        d.customer_id,
        d.customer_name,
        d.delivery_date,
        d.pay_method,
        d.pay_date,
        d.salesman,
        d.creator,
        d.contacts,
        d.contact_number,
        d.delivery_address,
        dd.order_id,
        dd.order_number,
        dd.area,
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
        dd.create_time
        from sd.delivery_detail dd
        left join sd.delivery d on dd.delivery_id=d.delivery_id
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
    </select>

    <select id="exportDeliveryDetailProductReport">
        select dd.id,
            dd.delivery_id,
               dd.delivery_number,
               od.product_id,
               od.product_name,
               d.payment_terms,
               d.project,
               d.customer_id,
               d.customer_name,
               d.delivery_date,
               d.pay_method,
               d.pay_date,
               d.salesman,
               d.creator,
               d.contacts,
               d.contact_number,
               d.delivery_address,
               dd.order_id,
               dd.order_number,
               sum(dd.area) as area,
               sum(dd.money) as money,
               sum(dd.quantity) as quantity,
               dd.delivery_detail_remakes,
               dd.create_time
        from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
                                   left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
    </select>
</mapper>