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

廖井涛

2024-07-07 fca78824eee77245214021e8fe28d3e47cd4bf48

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

@@ -837,4 +837,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=inventory+${orderDetail.quantity},quantity_available=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>