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

chenlu

2024-09-25 430ab98c6225a276bab44c5eebb304fc6206cb73

 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">
@@ -468,6 +468,12 @@
    <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>

@@ -879,6 +885,16 @@
        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>