Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi

FactorySystemApi/Controllers/TeamworkController.cs

@@ -945,13 +945,17 @@ namespace FactorySystemApi.Controllers
 
                 // 获取需要转换的值
                 // 获取工厂ID
+                var createFactoryId = -1;
                 TFS_Factory factory = TeamworkBll.GetFactoryIdByName(factoryName.ToString());
                 if (factory == null)
                 {
                     errStr = errStr + "模式不正确;";
                     isOk = false;
                 }
-                var createFactoryId = factory.FID;
+                else
+                {
+                    createFactoryId = factory.FID;
+                }                
 
                 // 获取物料组Id
                 if (!materialGroup.ToString().Contains("+"))
@@ -966,14 +970,25 @@ namespace FactorySystemApi.Controllers
                 var formulaId = -1;
                 if (!string.IsNullOrEmpty(testCode.ToString()) && !string.IsNullOrEmpty(versionCode.ToString()))
                 {
+                    double dVersion;
+                    bool isVersionNum = double.TryParse(versionCode.ToString(), out dVersion);
+
+                    if (isVersionNum)
+                    {
+                        versionCode = string.Format("{0:F4}", dVersion);
+                    }
+
                     TFS_Formula formula = TeamworkBll.GetFormulaByTestCodeAndVersion(testCode.ToString(), versionCode.ToString());
                     if (formula == null)
                     {
                         errStr = errStr + "试验号或版本号不正确;";
                         isOk = false;
                     }
-                    formulaName = formula.FName + "+" + formula.FTestCode + "+" + formula.FVersionCode;
+                    else
-                    formulaId = formula.FID;
+                    {
+                        formulaName = formula.FName + "+" + formula.FTestCode + "+" + formula.FVersionCode;
+                        formulaId = formula.FID;
+                    }
                 }