Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Packing/Packing_ProdWeightSet.cs

@@ -208,7 +208,7 @@ namespace UAS_MES.Packing
             //查询重量设置采样个数
             try
             {
-                samplesCount = int.Parse(dh.GetConfig("重量设置采样个数", "MESSetting").ToString());
+                samplesCount = int.Parse(dh.GetConfig("prodWeightSetting", "MESSetting").ToString());
             }
             catch (Exception ess)
             {