From 3592b946c7ccb8f75cf6b17373b41313dee0d380 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 30 May 2023 12:02:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=8C=85=E6=9D=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=8B=E9=A1=B9=E4=B8=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=AD=90=E5=8C=85=E6=9D=90=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FactorySystemBll/PackageBll.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 501f6b3237d172afa11d2e2320ee6ab602c00f00 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 30 May 2023 12:54:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=85=A5=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=20=E6=95=B0=E5=80=BC=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E6=A0=BC=E5=BC=8F=E4=B8=BA=EF=BC=9A0.0000=20=E9=9D=9E?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E6=83=85=E5=86=B5=E4=B8=8B=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E5=8E=9F=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FactorySystemApi/Controllers/FormulaController.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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"))