blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-03-21 7ec26ace7100b90b87603acd9dbbc8012a51eed0 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml


@@ -190,7 +190,7 @@


               od.area,


               od.gross_area,


               od.compute_area,


               od.compute_gross_area,


               dd.area as compute_gross_area,


               od.processing_note,


               od.edging_type,


               od.perimeter,


@@ -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>






@@ -792,12 +788,6 @@


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


                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')


            </if>


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


                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')


            </if>


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


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')


            </if>


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


                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')


            </if>


@@ -859,10 +849,10 @@


                and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')


            </if>


            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">


                and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')


            </if>


            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')


                and od.product_id like concat('%', #{deliveryDetail.orderDetail.productId},'%')


            </if>


            <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">


                and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')


@@ -900,12 +890,6 @@


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


                and dd.delivery_number like concat('%',#{deliveryDetail.deliveryNumber},'%')


            </if>


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


                and od.product_id like concat('%',#{deliveryDetail.orderDetail.productId},'%')


            </if>


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


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')


            </if>


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


                and dd.order_id like concat('%', #{deliveryDetail.orderId},'%')


            </if>


@@ -967,10 +951,10 @@


                and d.delivery_address like concat('%', #{deliveryDetail.delivery.deliveryAddress},'%')


            </if>


            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productName != null and deliveryDetail.orderDetail.productName != '')">


                and od.product_id like concat('%', #{deliveryDetail.orderDetail.productName},'%')


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productName},'%')


            </if>


            <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.productId != null and deliveryDetail.orderDetail.productId != '')">


                and od.product_name like concat('%', #{deliveryDetail.orderDetail.productId},'%')


                and od.product_id like concat('%', #{deliveryDetail.orderDetail.productId},'%')


            </if>


            <if test="deliveryDetail.order!=null and (deliveryDetail.order.otherMoney != null )">


                and o.other_money regexp REGEXP_REPLACE(#{deliveryDetail.order.otherMoney},'\\.0+$','')


@@ -990,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,IF(#{type}='product_abbreviation',pt.remarks,od.product_name) as 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}


@@ -1014,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,


@@ -1023,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


@@ -1059,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}


@@ -1096,7 +1081,10 @@


        dd.quantity,


        dd.delivery_detail_remakes,


        dd.create_time,


        o.other_money


        o.other_money,


        d.freight,


        d.freight_price,


        d.freight_quantity


        from sd.delivery_detail dd


        left join sd.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


@@ -1132,7 +1120,10 @@


               dd.delivery_detail_remakes,


               dd.price,


               dd.create_time,


               o.other_money


               o.other_money,


               d.freight,


               d.freight_price,


               d.freight_quantity


        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


                                   left join sd.`order` o on dd.order_id=o.order_id