commit by yzf

FactorySystemApi/Controllers/FormulaController.cs

@@ -14,6 +14,7 @@ using FactorySystemModel.RequestModel;
 using FactorySystemApi.Plm_Formula;
 using System.Web.UI.WebControls;
 using Newtonsoft.Json;
+using Aspose.Cells;
 
 namespace FactorySystemApi.Controllers
 {
@@ -62,7 +63,19 @@ namespace FactorySystemApi.Controllers
                 apiResult.Data = FormulaBll.GetFormulaList();
             }, apiResult, Request);
         }
-
+        /// <summary>
+        /// 获取修改配方集合
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUpdateFormulaList() 
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                apiResult.Data = FormulaBll.GetUpdateFormulaList();
+            }, apiResult, Request);
+        }
 
         /// <summary>
         /// 分业请求
@@ -80,6 +93,65 @@ namespace FactorySystemApi.Controllers
                 };
             }, apiResult, Request);
         }
+        /// <summary>
+        /// 获取配方变更列表
+        /// </summary>
+        /// <param name="fq"></param>
+        /// <returns></returns>
+        [HttpPost]
+
+        public ApiResult GetUpdateFormulaPageList(FormulaQuery fq)
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                apiResult.Data = new
+                {
+                    List = FormulaBll.GetUpdateFormulaList(fq, out var totalNumber),
+                    Total = totalNumber
+                };
+            }, apiResult, Request);
+        }
+
+        /// <summary>
+        /// 更新修改配方的描述及状态
+        /// </summary>
+        /// <param name="inParam"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult EditUpdateFormula(Dictionary<string, object> inParam) 
+        {
+            ApiResult apiResult = new ApiResult();
+            apiResult.Data = 0;
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (inParam == null)
+                {
+                    apiResult.Error("未接收到参数");
+                }
+                if (!inParam.ContainsKey("FID")) 
+                {
+                    apiResult.Error("未接收到参数FID");
+                }
+                if (!inParam.ContainsKey("Remark"))
+                {
+                    apiResult.Error("未填写备注说明");
+                }
+                else 
+                {
+                    int userId = -1;
+                    userId = Request.Properties["token"] is ApiAuthInfo user ? user.FID : userId;
+                    int fid = int.Parse(inParam["FID"].ToString());
+                    TFS_UpdateFormula model = FormulaBll.GetUpdateFormulaByFID(fid);
+                    model.Update_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
+                    model.Remark = inParam["Remark"].ToString();
+                    model.Status = "已处理";
+                    model.Update_User = userId.ToString();
+
+                    apiResult.Data= FormulaBll.EditUpdateFormula(model);
+                }
+            }, apiResult, Request, inParam);
+        }
 
         /// <summary>
         /// 对接配方数据（对方写入）
@@ -171,6 +243,8 @@ namespace FactorySystemApi.Controllers
                         int userId = -1;
                         if (Request.Properties.ContainsKey("token"))
                         {
+                         
+
                             userId = Request.Properties["token"] is ApiAuthInfo user ? user.FID : userId;
                             apiResult.Data = FormulaBll.DockingRecipeData(new List<TFS_Formula>() { formula }, userId);
                         }
@@ -183,6 +257,83 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request, inParam);
         }
 
+        [HttpPost]
+        public ApiResult DockingChangeData(Dictionary<string, object> inParam) 
+        {
+            ApiResult apiResult = new ApiResult();
+            apiResult.Data = 0;
+
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (inParam == null)
+                {
+                    apiResult.Error("未接收到参数");
+                }
+                else
+                {
+
+
+
+                    if (!inParam.ContainsKey("SP"))
+                    {
+                        apiResult.Error("PLM规格内码不能为空");
+                    }
+                    else if (!inParam.ContainsKey("SP_VERSION"))
+                    {
+                        apiResult.Error("版本号不能为空");
+                    }
+                    else if (!inParam.ContainsKey("Name"))
+                    {
+                        apiResult.Error("配方中文名称不能为空");
+                    }
+                    else if (!inParam.ContainsKey("Type"))
+                    {
+                        apiResult.Error("配方类型不能为空");
+                    }
+                    else if (!inParam.ContainsKey("SP_AUTHOR"))
+                    {
+                        apiResult.Error("修改人不能为空");
+                    }
+                    else
+                    {
+                        //int userId = -1;
+                        if (Request.Properties.ContainsKey("token"))
+                        {
+                            string sVersion = inParam["SP_VERSION"].ToString();
+                            double dVersion;
+
+                            bool isVersionNum = double.TryParse(sVersion, out dVersion);
+
+                            if (isVersionNum)
+                            {
+                                sVersion = string.Format("{0:F4}", dVersion);
+                            }
+                            TFS_UpdateFormula tFS_UpdateFormula = new TFS_UpdateFormula()
+                            {
+                                SP = inParam["SP"].ToString(),
+                                SP_VERSION = sVersion,
+                                SP_VALUE = inParam["SP_VALUE"].ToString(),
+                                Name = inParam["Name"].ToString(),
+                                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 = inParam.ContainsKey("Change_List")?inParam["Change_List"].ToString():"",
+                            };
+                            apiResult.Data = FormulaBll.SevaTFS_UpdateFormula(tFS_UpdateFormula);
+
+                            //userId = Request.Properties["token"] is ApiAuthInfo user ? user.FID : userId;
+                            //apiResult.Data = FormulaBll.DockingRecipeData(new List<TFS_Formula>() { formula }, userId);
+                        }
+                        else
+                        {
+                            apiResult.Error("token信息不存在");
+                        }
+                    }
+                }
+            }, apiResult, Request, inParam);
+        }
+
         /// <summary>
         /// （对接）SAP配方同步
         /// </summary>
@@ -523,7 +674,7 @@ namespace FactorySystemApi.Controllers
                         FPlmCode = item.Code,
                         FName = item.Name,
                         //FCode = item.Code,
-                        FType = item.Type.ToLower(),
+                        FType = item.Type!=null? item.Type.ToLower():"",
                         //FTestCode = item.TestNO,
                         FVersionCode = item.Version,
                         FParentID = parentId
@@ -539,6 +690,8 @@ namespace FactorySystemApi.Controllers
                         FLevel = materLevel,
                         FBomMaterialID = material.FID
                     };
+
+                    
                     if (material.FType == "a" || material.FType == "f")
                     {
                         material.FType = "20";
@@ -603,13 +756,17 @@ namespace FactorySystemApi.Controllers
                             }
                         }
                     }
+                    if (string.IsNullOrWhiteSpace(item.AMaterialCode)) 
+                    {
+                        item.AMaterialCode = "空";
+                    }
                     item.ABomType = "kg";
 
-                    if (item.Name.Contains("@"))
+                    if (item.Name!=null&&item.Name.Contains("@"))
                     {
                         item.EnName = "甜味";
                     }
-                    else if (item.Name.Contains("□"))
+                    else if (item.Name != null && item.Name.Contains("□"))
                     {
                         item.EnName = "咸味";
                     }

FactorySystemBll/FormulaBll.cs

@@ -29,6 +29,25 @@ namespace FactorySystemBll
             return AppSettingsHelper.GetSqlSugar().Queryable<TFS_Formula>().Where(s => s.FDeleted != isDelete).Distinct().ToList();
         }
 
+
+
+        /// <summary>
+        /// 获取修改配方信息
+        /// </summary>
+        public static List<TFS_UpdateFormula> GetUpdateFormulaList()
+        {
+            return AppSettingsHelper.GetSqlSugar().Queryable<TFS_UpdateFormula>().Distinct().OrderByDescending(m=>m.Change_Time).ToList();
+        }
+
+        /// <summary>
+        /// 获取修改配方信息更具ID获取
+        /// </summary>
+        public static TFS_UpdateFormula GetUpdateFormulaByFID(int fid)
+        {
+            return AppSettingsHelper.GetSqlSugar().Queryable<TFS_UpdateFormula>().Where(m=>m.FID==fid).Distinct().OrderByDescending(m => m.Change_Time).ToList().LastOrDefault();
+        }
+
+
         public List<TFS_Formula> GetFormulaListById(int id)
         {
             int isDelete = (int)Constant.DeleteCode.已删除;
@@ -50,6 +69,23 @@ namespace FactorySystemBll
                 .WhereIF(tr.FName != null, s => s.FName.Contains(tr.FName) || s.FPlmCode.Contains(tr.FPlmCode) || s.FTestCode.Contains(tr.FTestCode) || s.FVersionCode.Contains(tr.FVersionCode))
                 .Select<FormulaRow>("*").ToPageList(tr.FPageIndex, tr.FPageSize, ref totalNumber);
         }
+        /// <summary>
+        /// 获取配方变更列表
+        /// </summary>
+        /// <param name="tr"></param>
+        /// <param name="totalNumber"></param>
+        /// <returns></returns>
+        public List<object> GetUpdateFormulaList(FormulaQuery tr, out int totalNumber)
+        {
+            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.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);
+            return list;
+        }
 
         /// <summary>
         /// 配方数据比对
@@ -469,5 +505,43 @@ namespace FactorySystemBll
 
             return views;
         }
+
+        /// <summary>
+        /// 新增修改配方表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int SevaTFS_UpdateFormula(TFS_UpdateFormula model) 
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            int taskId = -1;
+            try
+            {
+                taskId = db.Insertable(model).IgnoreColumns(true).ExecuteReturnIdentity();
+            }
+            catch (Exception)
+            {
+
+                taskId = -1; ;
+            }
+            return taskId;
+        }
+
+        public int EditUpdateFormula(TFS_UpdateFormula model) 
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            int taskId = -1;
+            try
+            {
+                //taskId = db.Insertable(model).IgnoreColumns(true).ExecuteReturnIdentity();
+                taskId = db.Updateable(model).IgnoreColumns(true).ExecuteCommand();
+            }
+            catch (Exception)
+            {
+
+                taskId = -1; ;
+            }
+            return taskId;
+        }
     }
 }

FactorySystemModel/FactorySystemModel.csproj

@@ -73,6 +73,7 @@
     <Compile Include="SqlSugarModel\FPower.cs" />
     <Compile Include="SqlSugarModel\TFS_FMaterialTask.cs" />
     <Compile Include="SqlSugarModel\TFS_FormualApplyHistory.cs" />
+    <Compile Include="SqlSugarModel\TFS_UpdateFormula.cs" />
     <Compile Include="SqlSugarModel\TFS_FreezingColumns.cs" />
     <Compile Include="SqlSugarModel\TDataCode.cs" />
     <Compile Include="SqlSugarModel\TBasicCode.cs" />

FactorySystemModel/ResponseModel/FormulaRow.cs

@@ -101,5 +101,10 @@ namespace FactorySystemModel.ResponseModel
         /// Nullable:False
         /// </summary>           
         public DateTime? FEditDate { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string FStatus { get; set; }
     }
 }

FactorySystemModel/SqlSugarModel/TFS_UpdateFormula.cs

@@ -0,0 +1,87 @@
+using System;
+using SqlSugar;
+
+namespace FactorySystemModel.SqlSugarModel
+{
+    ///<summary>
+    ///配方表
+    ///</summary>
+    [SugarTable("TFS_UpdateFormula")]
+    public partial class TFS_UpdateFormula
+    {
+        public TFS_UpdateFormula()
+        {
+
+        }
+        /// <summary>
+        /// Desc:唯一标识
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int FID { get; set; }
+
+        /// <summary>
+        /// PLM规格内码
+        /// </summary>
+        public string SP { get; set; }
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public string SP_VERSION { get; set; }
+        /// <summary>
+        /// 试验号
+        /// </summary>
+        public string SP_VALUE { get; set; }
+
+        /// <summary>
+        /// 配方中文名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 配方类型
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// 转规格人员
+        /// </summary>
+        public string SP_AUTHOR { get; set; }
+
+        /// <summary>
+        /// 变化内容
+        /// </summary>
+        public string Change_Content { get; set; }
+
+        /// <summary>
+        /// 变化日期
+        /// </summary>
+        public string Change_Time { get; set; }
+
+        /// <summary>
+        /// 受影响其他配方
+        /// </summary>
+        public string Change_Other { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 修改日期
+        /// </summary>
+        public string Update_Time { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string Update_User { get; set; }
+    }
+}