Revert "拆分原材料消耗配料"

This reverts commit 8f336bac8047db5d238f0f90541a063e16de6cb9.