Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-11-11 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -437,7 +437,7 @@
    </select>

    <select id="findDeliverydetailsum"  >
        select sum(quantity) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
        select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
    </select>

    <update id="updateOrderWarehousingState">
@@ -461,13 +461,19 @@

    <update id="updateIntOrderNumberConut">
        update sd.order_detail
        set warehouse_num=warehouse_num+${quantity}
        set warehouse_num=warehouse_num+${quantity},update_time=now()
        where order_number=#{orderNumber} and order_id=#{orderId}
    </update>

    <update id="updateOutOrderNumberConut">
        update sd.order_detail
        set warehouse_num=warehouse_num-${quantity}
        where order_number=#{orderNumber} and order_id=#{orderId}
    </update>

    <update id="updateOrderNumberConut">
        update sd.order_detail
        set warehouse_num=${quantity},update_time=now()
        where order_number=#{orderNumber} and order_id=#{orderId}
    </update>

@@ -530,6 +536,20 @@
    <select id="findOrderNumberdcount" >
        select count(*)
        from  mm.`finished_goods_inventory`
        where order_number = #{orderNumber} and order_id=#{orderId};

    </select>

    <select id="findOrderNumberd" >
        select *
        from  mm.`finished_goods_inventory`
        where order_number = #{orderNumber} and order_id=#{orderId};

    </select>

    <select id="findOrderDetailNumberd" >
        select *
        from  sd.`order_detail`
        where order_number = #{orderNumber} and order_id=#{orderId};

    </select>
@@ -867,11 +887,21 @@

    <update id="updateOrderInventory">
        update mm.finished_goods_inventory
        set inventory=inventory+${orderDetail.quantity},quantity_available=quantity_available+${orderDetail.quantity},
        set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
        update_time=now(),area=actual_signal_area*quantity_available
        where order_number=#{orderDetail.orderNumber}  and order_id=#{orderDetail.orderId}
    </update>

    <select id="findFlowCard">
        select * from pp.flow_card
        where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId} group by process_id
    </select>

    <select id="findDeliverydetail">
        select * from sd.delivery_detail
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
    </select>