Fix Bug For comp312
Merge branch 'Bag_with_Qty_In_comp312' into dev
Merge branch 'dev' of https://github.com/distributor/Distributor.Client into dev