commit by yzf

FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs

@@ -167,17 +167,25 @@ namespace FactorySystemApi.Controllers
 
                                     MaterialTeamworkBll.CreateProductView(teamwork, editMaterialList, user.FID);
                                     //开始BOM下载
-                                    DockGetBomData(teamwork.FID, user.FID);
-                                    MaterialTeamworkBll.HasMaterialTestCode(teamwork);
+                                    int dow= DockGetBomData(teamwork.FID, user.FID);
+                                    if (dow > 0)
+                                    {
+                                        MaterialTeamworkBll.HasMaterialTestCode(teamwork);
 
-                                    BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
-                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                                        BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
+                                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
+                                    }
+                                    else
+                                    {
+                                        BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
+                                        BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
+                                    }
                                   
                                 }
                                 else
                                 {
-                                    BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.TaskType.配方选择).ToString());
-                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.ProcessType.协同发起, 1, 1);
+                                    BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
+                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.BOM下载, 1, 1);
                                 }
                             }
                             else
@@ -586,7 +594,7 @@ namespace FactorySystemApi.Controllers
                         * 在创建各类事项前，先创建物料分类事项
                         * 此处创建各类事项流程中断，转移至物料分类事项提交后进行
                         * **/
-                        BaseBll.CreateTaskData2(teamwork.FID, userId, "2"); //新增物料分类事项
+                        BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项
                         BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
 
                         ////协同发起事项
@@ -616,7 +624,7 @@ namespace FactorySystemApi.Controllers
                 {
                     OperateLogBll.Add(teamwork.FID, 2, "BOM下载失败，BOM数据为空", userId);
                     BaseBll.CreateTaskData2(teamwork.FID, userId, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
-                    BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.ProcessType.协同发起, 2, 1);
+                    BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialTask.物料分类, 2, 1);
                     HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID);
                 }
             }
@@ -624,7 +632,7 @@ namespace FactorySystemApi.Controllers
             {
                 OperateLogBll.Add(teamwork.FID, 2, "BOM下载失败，请稍后重试（对接）", userId);
                 BaseBll.CreateTaskData2(teamwork.FID, userId, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
-                BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 2, 1);
+                BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialTask.物料分类, 2, 1);
                 ExceptionHelper.AddSystemJournal(Request, specifList[0], ex.Message, userId, "DockGetBomData");
             }
             //日志添加

FactorySystemBll/HalfMaterialTaskBll.cs

@@ -21,7 +21,7 @@ namespace FactorySystemBll
             totalNumber = 0;
             var db = AppSettingsHelper.GetSqlSugar();
             return db.Queryable<TFS_HalfMaterialTask, TFS_HalfMaterialFTeamwork, TBasicCode,TFS_Formula>((a, b, c,d) => new JoinQueryInfos(JoinType.Inner, a.FTeamID == b.FID,
-                    JoinType.Inner, c.FType == 33 && a.FType == int.Parse(c.FValue), JoinType.Left, b.FNewTestCode == d.FTestCode))
+                    JoinType.Inner, c.FType == 46 && a.FType == int.Parse(c.FValue), JoinType.Left, b.FNewTestCode == d.FTestCode))
                 // 事项状态
                 .WhereIF(tq.FState > 0 && tq.FState != 99, (a, b) => a.FState == tq.FState)
                 // 事项状态

FactorySystemBll/ViewBll.cs

@@ -279,6 +279,7 @@ namespace FactorySystemBll
                         FType = 2,
                         FDataID = materialId,
                         FAddUser = userId,
+                        FType2= temp.FTypeID2,
                         FMaterialGroup = temp.FMaterialGroup,
                         FMaterialType = temp.FMaterialType
                     };

FactorySystemModel/EnumModel/Constant.cs

@@ -177,14 +177,15 @@ namespace FactorySystemModel.EnumModel
         //code=45
         public enum HalfMaterialTask
         {
-            BOM下载 = 1,
-            物料分类 = 2,
-            物料编辑 = 3
+            BOM下载 = 0,
+            物料分类 = 1,
+            物料编辑 = 2
         }
 
         //code=46
         public enum HalfMaterialProcessType
         {
+            BOM下载 = 0,
             物料分类 = 1,
             物料编辑 = 2,
             流程完成 = 3,

FactorySystemModel/SqlSugarModel/TFS_MaterialInfo.cs

@@ -2018,6 +2018,12 @@ namespace FactorySystemModel.SqlSugarModel
         /// </summary>
         public string FAccountCostAccountBatchType { get; set; }
 
+
+        /// <summary>
+        /// 二级分类
+        /// </summary>
+        public int FType2 { get; set; }
+
         /// <summary>
         /// Desc:是否删除
         /// Default:0