Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-22 7f54cd99dfaf0cd391eaed930872460f85cd7a8e

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

@@ -428,6 +428,10 @@
        select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
    </select>

    <select id="findOrderDeliveryQuantitySum"  >
        select sum(delivery_num) from sd.order_detail where order_id=#{orderId}
    </select>

    <select id="findDeliveryQuantity" >
        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}
    </select>
@@ -525,6 +529,13 @@

    <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};

@@ -833,4 +844,42 @@
        ;
    </select>

    <select id="getSelectOrderDetail" >
        select * from sd.order_detail where order_id=#{orderId}
    </select>

    <insert id="insertOrderFinishedGoodsInventory"  useGeneratedKeys="true"  >
        insert into mm.finished_goods_inventory (order_id,
                                                 order_number,
                                                 process_id,
                                                 inventory,
                                                 actual_signal_area,
                                                 area,
                                                 quantity_available,
                                                 warehouse_number,
                                                 storage_region,
                                                 `status`,
                                                 enter_storage_time,
                                                 update_time,
                                                 end_time,
                                                 remark
        )
        values (
                   #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
                   #{orderDetail.computeGrossArea},
                   #{orderDetail.quantity},null,"",
                   0,now(),now(),null,""
               )
    </insert>

    <update id="updateOrderInventory">
        update mm.finished_goods_inventory
        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>




</mapper>