diff --git a/FactorySystemApi/Controllers/FormulaController.cs b/FactorySystemApi/Controllers/FormulaController.cs index f98849b..e7d1187 100644 --- a/FactorySystemApi/Controllers/FormulaController.cs +++ b/FactorySystemApi/Controllers/FormulaController.cs @@ -102,7 +102,20 @@ namespace FactorySystemApi.Controllers if (inParam.ContainsKey("SP_VERSION")&& !inParam.ContainsKey("FVersionCode")) { - inParam.Add("FVersionCode", inParam["SP_VERSION"].ToString()); + //inParam.Add("FVersionCode", inParam["SP_VERSION"].ToString()); + + // 20230530 格式化传入的版本号 + string sVersion = inParam["SP_VERSION"].ToString(); + double dVersion; + + bool isVersionNum = double.TryParse(sVersion, out dVersion); + + if (isVersionNum) + { + sVersion = string.Format("{0:F4}", dVersion); + } + + inParam.Add("FVersionCode", sVersion); } if (inParam.ContainsKey("SP_VALUE")&&!inParam.ContainsKey("FTestCode")) diff --git a/FactorySystemBll/PackageBll.cs b/FactorySystemBll/PackageBll.cs index 2db58f0..428d62f 100644 --- a/FactorySystemBll/PackageBll.cs +++ b/FactorySystemBll/PackageBll.cs @@ -421,7 +421,7 @@ namespace FactorySystemBll } string factory = teamwork.FCreateFactoryID.ToString(); if (teamwork.FCreateFactoryID != teamwork.FProdFactoryID) factory += "," + teamwork.FProdFactoryID; - BaseBll.CreateTaskData(teamId, userId, "11", factory, true, db); + //BaseBll.CreateTaskData(teamId, userId, "11", factory, true, db); db.CommitTran(); } catch (Exception)