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

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")) 

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)