From 681ca601618c2d8503dd85c1cb9a4ad9c2fb08c9 Mon Sep 17 00:00:00 2001
From: Leo <novelliou@hotmail.com>
Date: Fri, 11 Aug 2023 20:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8D=8F=E5=90=8C=E6=97=B6=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E8=AF=95=E9=AA=8C=E5=8F=B7=E6=88=96=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/TeamworkController.cs         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs
index 570450d..7fc3b93 100644
--- a/FactorySystemApi/Controllers/TeamworkController.cs
+++ b/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;
-                    formulaId = formula.FID;
+                    else
+                    {
+                        formulaName = formula.FName + "+" + formula.FTestCode + "+" + formula.FVersionCode;
+                        formulaId = formula.FID;
+                    }
                 }