blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
huang
2025-01-14 93109c8a43cceb99ce39e1ccfdbd560ac2547422 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml


@@ -274,7 +274,6 @@




        </where>


        order by dd.id


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectShippingOrderDetailPageTotal">


@@ -356,7 +355,6 @@


                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">


@@ -452,7 +450,6 @@


                and od.perimeter regexp #{orderDetail.perimeter}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>




    <select id="getSelectShippingOrderDetailsPageTotal">


@@ -525,7 +522,6 @@


                and od.perimeter regexp #{orderDetail.perimeter}


            </if>


        </where>


        limit #{offset},#{pageSize};


    </select>






@@ -978,21 +974,19 @@


    </select>




    <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >


        select dd.delivery_id,od.order_id,od.product_id,pt.remarks as product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from


        select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity 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






        <where>


            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">


                and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')


            </if>


        </where>




                where dd.delivery_id like concat('%',#{deliveryId},'%')




        group by od.order_id,od.product_name,od.product_id


    </select>




    <select id="getSelectOrderPrinting"  >


        select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from


        select od.order_id,od.product_id,od.product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as gross_amount ,sum(od.quantity) as quantity from


         order_detail od left join product p on od.product_id=p.id


        where od.order_id = #{orderId}


        and od.product_id = #{productId}


@@ -1002,7 +996,7 @@


    <select id="getSelectDeliveryDetailPrinting" >


        select od.order_id,


               od.order_number,


               p.remarks as product_name,


               od.product_name,


               od.width,


               od.height,


               dd.quantity,


@@ -1011,7 +1005,8 @@


               ifnull(od.processing_note,"") as processingNote,


               ifnull(od.building_number,"") as buildingNumber,


               dd.price,


               od.other_columns


               od.other_columns,


               od.remarks


        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


@@ -1047,10 +1042,12 @@


               od.quantity,


               od.gross_amount,


               od.compute_gross_area,


               od.area,


               ifnull(od.processing_note,"") as processingNote,


               ifnull(od.building_number,"") as buildingNumber,


               od.price,


               od.other_columns


               od.other_columns,


               od.remarks


        from  order_detail od


        where  od.order_id = #{orderId}


          and od.product_id = #{productId}