blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-02-27 e8ba2a1bec7ffbd78cb941521b31d000890e66de 
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml


@@ -64,6 +64,7 @@


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


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


        <result column="warehouse_num" property="warehouseNum"/>


        <result column="delivery_num" property="deliveryNum"/>




        <result column="order_number" property="deliveryDetail.orderNumber"/>


        <result column="delivery_id" property="deliveryDetail.deliveryId"/>


@@ -208,7 +209,8 @@


    </select>




    <select id="getSelectAllocatePageTotal"  >


        select CEILING(count(zu.order_number)/#{pageSize}) from


        select CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',


        count(zu.order_number) as 'total' from


            (select fgi.order_number as order_number


             from mm.finished_goods_inventory fgi


                      left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number


@@ -263,7 +265,7 @@


    <update id="updateDeliveryDetailState">


        update sd.delivery_detail


        set delivery_detail_state=#{state}


        where order_number=#{orderDetail.deliveryDetail.orderNumber}  and order_id=#{orderDetail.deliveryDetail.orderId}


        where order_number=#{orderDetail.deliveryDetail.orderNumber}  and order_id=#{orderDetail.deliveryDetail.orderId} and delivery_id=#{orderDetail.deliveryDetail.deliveryId}


    </update>




    <update id="updateInventoryquantityavailable">


@@ -275,12 +277,14 @@






    <select id="getseletdeliveryDetailPageTotal"  >


        select CEILING(count(dd.id)/#{pageSize})


        select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',


        count(dd.id) as 'total'


        from sd.delivery_detail dd


                 left join sd.delivery d on dd.delivery_id = d.delivery_id


                 left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number


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


        <where>


                and dd.delivery_detail_state=1


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


                and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}


            </if>


@@ -347,6 +351,7 @@


               od.height,


               d.quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


               od.building_number,


               d.creator,


@@ -355,9 +360,10 @@


        from sd.delivery_detail dd


                 left join sd.delivery d on dd.delivery_id = d.delivery_id


                 left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number


                 left join sd.`order` o on o.order_id = dd.order_id where dd.delivery_detail_state=1


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




        <where>


                and dd.delivery_detail_state=1


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


                and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}


            </if>


@@ -421,6 +427,14 @@


        select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}


    </select>




    <select id="findDeliveryQuantity" >


        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}


    </select>




    <select id="findDeliverydetailsum"  >


        select sum(quantity) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}


    </select>




    <update id="updateOrderWarehousingState">


        update sd.`order`


        set warehousing=#{state}


@@ -431,6 +445,12 @@


        update sd.`order`


        set delivery=#{state}


        where order_id=#{orderId}


    </update>




    <update id="updateDeliveryDeliveryState">


        update sd.`delivery`


        set stock_state=#{state}


        where delivery_id=#{deliveryId}


    </update>




    <update id="updateIntOrderNumberConut">


@@ -575,7 +595,8 @@


        limit #{offset},#{pageSize};


    </select>


    <select id="getseletwarehousingPageTotal" >


        select  CEILING(count(zu.order_number)/#{pageSize}) from (


        CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',


        count(zu.order_number) as 'total' from (


        select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on


        fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id


        <where>


@@ -724,7 +745,8 @@




    <select id="getPageTotal">


        select


        CEILING(count(fgi.id)/#{pageSize})


        CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal',


        count(fgi.id) as 'total'


        from finished_goods_inventory fgi


        left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number


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