arrange ration
Merge branch 'master' of https://github.com/EdgeComputing/cats
maintain physical and free stock status reports
fix conflict