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

FactorySystemApi/Controllers/FormulaController.cs

@@ -33,6 +33,19 @@ namespace FactorySystemApi.Controllers
             UpdateField = "";
         }
 
+        /// <summary>
+        /// 获取配方集合
+        /// </summary>
+        [HttpPost]
+        public ApiResult GetFormulaList()
+        {
+            ApiResult apiResult = new ApiResult();
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                apiResult.Data = FormulaBll.GetFormulaList();
+            }, apiResult, Request);
+        }
+
 
         /// <summary>
         /// 分业请求

FactorySystemApi/Controllers/MaterialController.cs

@@ -11,6 +11,7 @@ using System.Reflection;
 using System.Web.Http;
 using FactorySystemModel.EnumModel;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace FactorySystemApi.Controllers
 {
@@ -322,6 +323,52 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request, inParam);
         }
 
+        /// <summary>
+        /// 更新替代料 判断任务是否完成
+        /// </summary>
+        /// <param name="inParam"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateDataModel2(Dictionary<string, object> inParam)
+        {
+            ApiResult apiResult = new ApiResult();
+           
+            //BaseBll.UpdateDataModel(inParam, "TFS_FTeamwork");
+
+            return ExceptionHelper.TryReturnException(() =>
+            {
+                if (inParam == null || inParam.Count < 0)
+                {
+                    apiResult.Error("未接收到参数");
+                }
+                else if (!inParam.ContainsKey("tempId")) 
+                {
+                    apiResult.Error("未找到协同ID");
+                }
+                else
+                {
+                    int tempId = int.Parse(inParam["tempId"].ToString());
+                    int taskId= int.Parse(inParam["taskId"].ToString());
+
+                    inParam.Remove("tempId");
+                    inParam.Remove("taskId");
+
+                    apiResult.Data = BaseBll.UpdateDataModel(inParam, "TFS_Material");
+
+                    List<TFS_Material> result = MaterialBll.GetMaterial(tempId);
+
+                    if (result.Where(m => m.FSuccedaneumID == 0).Count() == 0)
+                    {
+                        BaseBll.UpdateTeamProcess(tempId, (int)Constant.ProcessType.替代品确认, 2, 2);
+                        int count=MaterialBll.ExecSql(BaseBll.GetTaskSql(taskId, 2, tempId, (int)Constant.TaskType.替代料确认));
+                    }
+                }
+
+                
+
+            }, apiResult, Request, inParam);
+        }
+
 
         #region 内部方法
 

FactorySystemBll/FormulaBll.cs

@@ -20,6 +20,16 @@ namespace FactorySystemBll
             return AppSettingsHelper.GetSqlSugar().Queryable<TBasicCode>().Where(s => s.FType == type && s.FState == 1).ToList();
         }
 
+        /// <summary>
+        /// 获取配置信息
+        /// </summary>
+        public static List<TFS_Formula> GetFormulaList()
+        {
+            int isDelete = (int)Constant.DeleteCode.已删除;
+            return AppSettingsHelper.GetSqlSugar().Queryable<TFS_Formula>().Where(s => s.FDeleted != isDelete).ToList();
+        }
+
+
         public List<FormulaRow> GetList(FormulaQuery tr, out int totalNumber)
         {
             totalNumber = 0;

FactorySystemBll/MaterialBll.cs

@@ -99,6 +99,14 @@ namespace FactorySystemBll
             return result;
         }
 
+        public List<TFS_Material> GetMaterial(int tempId) 
+        {
+            return AppSettingsHelper.GetSqlSugar()
+                .Queryable<TFS_Material, TFS_ViewMaterial>((a, b) => new JoinQueryInfos(JoinType.Left, a.FID == b.FMaterialID))
+                .Where((a, b) => b.FTeamID == tempId).Select<TFS_Material>((a, b) => a).ToList();
+        }
+
+
         /// <summary>
         /// 物料子数据比对
         /// </summary>
@@ -1315,6 +1323,12 @@ namespace FactorySystemBll
             return ts;
         }
 
+        public int ExecSql(string sql) 
+        {
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+            return db.Ado.ExecuteCommand(sql);
+        }
+
 
     }
 }