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

FactorySystemApi/Controllers/FormulaController.cs

@@ -119,6 +119,11 @@ namespace FactorySystemApi.Controllers
                         if (temp != null) temp.SetValue(formula, GetValueByName(inParam, field.FFieldName, field.FDefault));
                     }
 
+
+                    if (inParam.ContainsKey("SP_AUTHOR")) 
+                    {
+                        formula.FConversionPersonnel = inParam["SP_AUTHOR"].ToString();
+                    }
                     if (string.IsNullOrEmpty(formula.FPlmCode))
                     {
                         apiResult.Error("FPlmCode不能为空");
@@ -145,10 +150,6 @@ namespace FactorySystemApi.Controllers
                     {
                         apiResult.Error("FConversionPersonnel不能为空");
                     }
-                    else if (string.IsNullOrEmpty(formula.FBomVersionCode))
-                    {
-                        apiResult.Error("FBomVersionCode不能为空");
-                    }
                     else
                     {
                         int userId = -1;

FactorySystemApi/Web References/Plm_Formula/Reference.cs

@@ -636,27 +636,29 @@ namespace FactorySystemApi.Plm_Formula {
         
         private string versionField;
 
-
+        public string SP { get; set; }
-        public string SP { get
+        public string SP_Version { get; set; }
-            {
+
-                return this.codeField;
+        //public string SP { get
-            }
+        //    {
-            set
+        //        return this.codeField;
-            {
+        //    }
-                this.codeField = value;
+        //    set
-            } 
+        //    {
-        }
+        //        this.codeField = value;
-        public string SP_Version
+        //    } 
-        {
+        //}
-            get
+        //public string SP_Version
-            {
+        //{
-                return this.versionField;
+        //    get
-            }
+        //    {
-            set
+        //        return this.versionField;
-            {
+        //    }
-                this.versionField = value;
+        //    set
-            }
+        //    {
-        }
+        //        this.versionField = value;
+        //    }
+        //}
 
         /// <remarks/>
         public string Code {