commit by yzf

FactorySystemApi/Controllers/FormulaController.cs

@@ -303,24 +303,35 @@ namespace FactorySystemApi.Controllers
                             double dVersion;
 
                             bool isVersionNum = double.TryParse(sVersion, out dVersion);
-
+                            int task = -1;
                             if (isVersionNum)
                             {
                                 sVersion = string.Format("{0:F4}", dVersion);
                             }
-                            TFS_UpdateFormula tFS_UpdateFormula = new TFS_UpdateFormula()
+                            if (inParam .ContainsKey("Change_List") && inParam["Change_List"] != null&& inParam["Change_List"].ToString() !="") 
                             {
-                                SP = inParam["SP"].ToString(),
+                                List<TFS_UpdateFormula> jsonList = JsonConvert.DeserializeObject<List<TFS_UpdateFormula>>(inParam["Change_List"].ToString());
-                                SP_VERSION = sVersion,
+
-                                SP_VALUE = inParam["SP_VALUE"].ToString(),
+                                foreach (var item in jsonList)
-                                Name = inParam["Name"].ToString(),
+                                {
-                                Type = inParam["Type"].ToString(),
+                                    TFS_UpdateFormula tFS_UpdateFormula = new TFS_UpdateFormula()
-                                SP_AUTHOR = inParam["SP_AUTHOR"].ToString(),
+                                    {
-                                //Change_Content = inParam["Change_Content"].ToString(),
+                                        SP = inParam["SP"].ToString(),
-                                Change_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm"),
+                                        SP_VERSION = sVersion,
-                                Change_Content = inParam.ContainsKey("Change_List")?inParam["Change_List"].ToString():"",
+                                        SP_VALUE = inParam["SP_VALUE"].ToString(),
-                            };
+                                        Name = inParam["Name"].ToString(),
-                            apiResult.Data = FormulaBll.SevaTFS_UpdateFormula(tFS_UpdateFormula);
+                                        Type = inParam["Type"].ToString(),
+                                        SP_AUTHOR = inParam["SP_AUTHOR"].ToString(),
+                                        //Change_Content = inParam["Change_Content"].ToString(),
+                                        Change_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm"),
+                                        Change_Content = JsonConvert.SerializeObject(item),
+                                    };
+                                    task = FormulaBll.SevaTFS_UpdateFormula(tFS_UpdateFormula);
+                                }
+                               
+                            }
+                           
+                            apiResult.Data = task;
 
                             //userId = Request.Properties["token"] is ApiAuthInfo user ? user.FID : userId;
                             //apiResult.Data = FormulaBll.DockingRecipeData(new List<TFS_Formula>() { formula }, userId);

FactorySystemApi/Web.config

@@ -13,7 +13,7 @@
 		<add key="ApiAuthSecretKey" value="zhkxfs" />
 		<!--<add key="ConnectionString" value="server=49.235.68.145,3456;uid=sa;pwd=zhenxuan@2019;database=FactorySystem" />-->
 		<!--<add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />-->
-		<add key="ConnectionString" value="server=192.168.8.157,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />
+		<add key="ConnectionString" value="server=192.168.8.156,12580;uid=tfs;pwd=tfs2022;database=FactorySystem" />
 		<!--<add key="ConnectionString" value="server=120.55.81.57;uid=sa;pwd=1qaz@WSX;database=FactorySystem" />-->
 
 		<add key="Sap_UserName" value="mcs_con" />

FactorySystemBll/FormulaBll.cs

@@ -80,7 +80,7 @@ namespace FactorySystemBll
             totalNumber = 0;
             var db = AppSettingsHelper.GetSqlSugar();
             List<object> list = db.Queryable<TFS_UpdateFormula>()
-                .WhereIF(tr.FPlmCode != null, s => s.SP.Contains(tr.FPlmCode))
+                .WhereIF(tr.FPlmCode != null, s => s.Change_Content.Contains(tr.FPlmCode))
                 .WhereIF(tr.FTestCode != null, s => s.SP_VALUE.Contains(tr.FTestCode))
                 .WhereIF(tr.FStatus != null, s => s.Status.Contains(tr.FStatus))
                 .Select<object>("*").ToPageList(tr.FPageIndex, tr.FPageSize, ref totalNumber);
@@ -536,7 +536,7 @@ namespace FactorySystemBll
                 //taskId = db.Insertable(model).IgnoreColumns(true).ExecuteReturnIdentity();
                 taskId = db.Updateable(model).IgnoreColumns(true).ExecuteCommand();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
 
                 taskId = -1; ;