Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

MainWindow.xaml.cs

@@ -888,6 +888,7 @@ namespace formula_manage
                 }
             }
         }
+
         private void CP_PRODUCT_CODE_DropDownClosed(object sender, EventArgs e)//原料代码选择事件
         {
             double ang;