From ce6d19af48b4487f909bbded4340c561187e2a11 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Thu, 27 Apr 2023 16:28:17 +0800
Subject: [PATCH] commit by yzf

---
 .../Controllers/FormulaController.cs          | 11 ++---
 .../Web References/Plm_Formula/Reference.cs   | 42 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/FactorySystemApi/Controllers/FormulaController.cs b/FactorySystemApi/Controllers/FormulaController.cs
index e7c69a1..f98849b 100644
--- a/FactorySystemApi/Controllers/FormulaController.cs
+++ b/FactorySystemApi/Controllers/FormulaController.cs
@@ -118,7 +118,12 @@ namespace FactorySystemApi.Controllers
                         PropertyInfo temp = propertys.Find(s => s.Name == field.FColumnFIeld);
                         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;
diff --git a/FactorySystemApi/Web References/Plm_Formula/Reference.cs b/FactorySystemApi/Web References/Plm_Formula/Reference.cs
index 1c6d7f9..009d4de 100644
--- a/FactorySystemApi/Web References/Plm_Formula/Reference.cs	
+++ b/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_Version { get; set; }
 
-        public string SP { get
-            {
-                return this.codeField;
-            }
-            set
-            {
-                this.codeField = value;
-            } 
-        }
-        public string SP_Version
-        {
-            get
-            {
-                return this.versionField;
-            }
-            set
-            {
-                this.versionField = value;
-            }
-        }
+        //public string SP { get
+        //    {
+        //        return this.codeField;
+        //    }
+        //    set
+        //    {
+        //        this.codeField = value;
+        //    } 
+        //}
+        //public string SP_Version
+        //{
+        //    get
+        //    {
+        //        return this.versionField;
+        //    }
+        //    set
+        //    {
+        //        this.versionField = value;
+        //    }
+        //}
 
         /// <remarks/>
         public string Code {