blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-08-09 01d8334aaf05ff0ac0e4c0de3e43b4ee6d6fa73b 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml


@@ -66,6 +66,7 @@


        <result column="delivery_number" property="deliveryNumber"/>


        <result column="quantity" property="quantity"/>


        <result column="area" property="area"/>


        <result column="price" property="price"/>


        <result column="money" property="money"/>


        <result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>


        <result column="delivery_detail_state" property="deliveryDetailState"/>


@@ -83,9 +84,14 @@


        <result column="delivery_date" property="delivery.deliveryDate"/>


        <result column="creator" property="delivery.creator"/>


        <result column="salesman" property="delivery.salesman"/>


        <result column="freight" property="delivery.freight"/>


        <result column="freight_price" property="delivery.freightPrice"/>


        <result column="freight_quantity" property="delivery.freightQuantity"/>




        <result column="product_id" property="orderDetail.productId"/>


        <result column="product_name" property="orderDetail.productName"/>




        <result column="other_money" property="order.otherMoney"/>








@@ -148,11 +154,11 @@




    <insert id="insertDeliveryDetail"  useGeneratedKeys="true" >


        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,price)


                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)


        values (


                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},


                #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},


                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}


                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}


               )


    </insert>




@@ -177,6 +183,7 @@


               od.height,


               od.shape,


               fgi.actual_signal_area,


               od.area,


               od.gross_area,


               od.compute_area,


               od.compute_gross_area,


@@ -366,6 +373,7 @@


               od.height,


               od.shape,


               fgi.actual_signal_area,


               od.area,


               od.gross_area,


               od.compute_area,


               od.compute_gross_area,


@@ -537,13 +545,19 @@


        dd.order_id,


        dd.order_number,


        dd.area,


        dd.price,


        dd.money,


        dd.quantity,


        dd.delivery_detail_remakes,


        dd.create_time


        dd.create_time,


        o.other_money,


        d.freight_price,


        d.freight_quantity,


        d.freight


        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


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


        <where>


               and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


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


@@ -565,13 +579,16 @@


                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')


            </if>


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


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


                and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')


            </if>


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


                and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')


            </if>


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


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


                and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')


            </if>


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


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


                and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')


            </if>


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


                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')


@@ -615,6 +632,18 @@


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">


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


            </if>


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


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


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">


                and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">


                and d.freight_quantity regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightQuantity},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">


                and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')


            </if>




        </where>


        order by dd.delivery_id,dd.delivery_number


@@ -627,6 +656,7 @@


        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


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


        <where>


            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


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


@@ -648,13 +678,16 @@


                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')


            </if>


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


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


                and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')


            </if>


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


                and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')


            </if>


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


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


                and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')


            </if>


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


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


                and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')


            </if>


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


                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')


@@ -698,7 +731,18 @@


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.deliveryAddress != null and deliveryDetail.delivery.deliveryAddress != '')">


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


            </if>




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


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


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">


                and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">


                and d.freight_quantity regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightQuantity},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">


                and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')


            </if>


        </where>


        order by dd.delivery_id,dd.delivery_number


    </select>


@@ -724,12 +768,18 @@


        dd.order_id,


        dd.order_number,


        sum(dd.area) as area,


        dd.price,


        sum(dd.money) as money,


        sum(dd.quantity) as quantity,


        dd.delivery_detail_remakes,


        dd.create_time


        dd.create_time,


        o.other_money,


        d.freight_price,


        d.freight_quantity,


        d.freight


        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


        <where>


            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


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


@@ -751,13 +801,16 @@


                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')


            </if>


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


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


                and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')


            </if>


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


                and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')


            </if>


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


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


                and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')


            </if>


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


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


                and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')


            </if>


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


                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')


@@ -807,9 +860,21 @@


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


                and od.product_name 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+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">


                and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">


                and d.freight_quantity like concat('%', #{deliveryDetail.delivery.freightQuantity},'%')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">


                and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')


            </if>




        </where>


        group by dd.delivery_id,od.product_id


        group by dd.delivery_id,dd.order_id,od.product_id


        order by dd.delivery_id,dd.delivery_number


        limit #{offset},#{pageSize};


    </select>


@@ -822,6 +887,7 @@


        select dd.id as id


        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


        <where>


            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


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


@@ -843,13 +909,16 @@


                and dd.order_number like concat('%', #{deliveryDetail.orderNumber},'%')


            </if>


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


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


                and dd.area regexp REGEXP_REPLACE(#{deliveryDetail.area},'\\.0+$','')


            </if>


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


                and dd.price regexp REGEXP_REPLACE(#{deliveryDetail.price},'\\.0+$','')


            </if>


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


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


                and dd.money regexp REGEXP_REPLACE(#{deliveryDetail.money},'\\.0+$','')


            </if>


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


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


                and dd.quantity regexp REGEXP_REPLACE(#{deliveryDetail.quantity},'\\.0+$','')


            </if>


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


                and dd.delivery_detail_remakes like concat('%', #{deliveryDetail.deliveryDetailRemakes},'%')


@@ -899,9 +968,21 @@


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


                and od.product_name 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+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freight != null )">


                and d.freight regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freight},'\\.0+$','')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightQuantity != null )">


                and d.freight_quantity like concat('%', #{deliveryDetail.delivery.freightQuantity},'%')


            </if>


            <if test="deliveryDetail.delivery!=null and (deliveryDetail.delivery.freightPrice != null )">


                and d.freight_price regexp REGEXP_REPLACE(#{deliveryDetail.delivery.freightPrice},'\\.0+$','')


            </if>




        </where>


        group by dd.delivery_id,od.product_id) as zu


        group by dd.delivery_id,dd.order_id,od.product_id) as zu


    </select>




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


@@ -1010,13 +1091,16 @@


        dd.order_id,


        dd.order_number,


        dd.area,


        dd.price,


        dd.money,


        dd.quantity,


        dd.delivery_detail_remakes,


        dd.create_time


        dd.create_time,


        o.other_money


        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


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


        left join sd.customer c on d.customer_id=c.id


        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}


    </select>


@@ -1046,12 +1130,15 @@


               sum(dd.money) as money,


               sum(dd.quantity) as quantity,


               dd.delivery_detail_remakes,


               dd.create_time


               dd.price,


               dd.create_time,


               o.other_money


        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


                                   left join sd.customer c on d.customer_id=c.id


        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}


        group by dd.delivery_id,od.product_id


        group by dd.delivery_id,dd.order_id,od.product_id


        order by dd.delivery_id,dd.delivery_number


    </select>


</mapper>