commit by yzf

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/FactorySystemApi/File/Temp

FactorySystemApi/Controllers/TeamworkController.cs

@@ -448,8 +448,13 @@ namespace FactorySystemApi.Controllers
                             { "FBomJson", bomStr }
                         };
                     BaseBll.UpdateDataModel(upParam, "TFS_FTeamwork");
-                    BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.视图类型编辑, 2, 2);
+                    BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.物料分类, 2, 2);
-                    int count= TeamworkBll.ExecSql(BaseBll.GetTaskSql(taskId, 2, teamId, (int)Constant.ProcessType.视图类型编辑));
+                    int count= TeamworkBll.ExecSql(BaseBll.GetTaskSql(taskId, 2, teamId, (int)Constant.ProcessType.物料分类));
+
+
+                    BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.替代品确认, 2, 1);
+                    BaseBll.CreateTaskData(teamwork.FID, user.FID, "16");//替代品确认
+
 
                     BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
 
@@ -530,7 +535,7 @@ namespace FactorySystemApi.Controllers
                         BaseBll.UpdateDataModel(upParam, "TFS_FTeamwork");
                         //协同发起事项
                         //BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
-                        BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.视图类型编辑, 2, 1);
+                        BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.物料分类, 2, 1);
                         //改
                         //if (teamwork.FPackID == -1)
                         //{

FactorySystemApi/Controllers/ViewController.cs

@@ -5,6 +5,7 @@ using FactorySystemCommon;
 using FactorySystemModel.BusinessModel;
 using FactorySystemModel.ResponseModel;
 using FactorySystemModel.SqlSugarModel;
+using Microsoft.Ajax.Utilities;
 using Newtonsoft.Json;
 
 namespace FactorySystemApi.Controllers
@@ -54,6 +55,32 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request);
         }
 
+        /// <summary>
+        /// 根据协同ID获取基础表集合
+        /// </summary>
+        /// <param name="inParam"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMaterialInfoListByTeamId(Dictionary<string, object> inParam) 
+        {
+            var apiResult = new ApiResult();
+
+
+
+            return ExceptionHelper.TryReturnException(() => {
+                if (!string.IsNullOrWhiteSpace(inParam["tempId"].ToString()))
+                {
+                    apiResult.Data = _viewBll.EexcSql(int.Parse(inParam["tempId"].ToString()));
+                }
+                else 
+                {
+                    apiResult.Data = _viewBll.EexcSql();
+                }
+            
+            }, apiResult, Request);
+        }
+
+
         /// <summary>
         /// 保存视图编辑的内容
         /// </summary>

FactorySystemBll/TeamworkBll.cs

@@ -130,7 +130,8 @@ namespace FactorySystemBll
                     int proType = int.Parse(item.FValue);
                     switch (proType)
                     {
-                        case (int)Constant.ProcessType.视图类型编辑:
+                        case (int)Constant.ProcessType.物料分类:
+                        case (int)Constant.ProcessType.替代品确认:
                         case (int)Constant.ProcessType.协同发起:
                             string funcIds1 = "1,2,3";//36
                             users = db.Queryable<TUser>().Where(string.Format(@"FState=1 and FRoleID in(select distinct FRoleID from

FactorySystemBll/ViewBll.cs

@@ -354,5 +354,24 @@ namespace FactorySystemBll
             }
             return result;
         }
+
+
+        public object EexcSql(int tempId=0) 
+        {
+            string sql = "";
+            if (tempId > 0)
+            {
+                sql = string.Format(@"SELECT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID WHERE a.FTeamID={0}", tempId);
+
+            }
+            else 
+            {
+                sql = string.Format(@"SELECT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID ");
+            }
+            SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+
+            return db.Ado.SqlQuery<object>(sql);
+
+        }
     }
 }

FactorySystemModel/EnumModel/Constant.cs

@@ -100,7 +100,8 @@ namespace FactorySystemModel.EnumModel
             成品视图物料组复核 = 12,
             流程确认完成 = 13,
             补充包材规格 = 14,
-            视图类型编辑=15
+            物料分类 = 15,
+            替代料确认=16
         }
 
         /// <summary>
@@ -108,7 +109,7 @@ namespace FactorySystemModel.EnumModel
         /// </summary>
         public enum ProcessType
         {
-            视图类型编辑=0,
+            物料分类=0,
             协同发起 = 1,
             成品视图 = 2,
             新半成品中间品香基 = 3,
@@ -117,7 +118,8 @@ namespace FactorySystemModel.EnumModel
             生产工艺路线 = 6,
             生成版本 = 7,
             组装BOM包含新包材 = 8,
-            流程完成 = 9
+            流程完成 = 9,
+            替代品确认=10
         }
 
         /// <summary>