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

FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs

@@ -730,6 +730,9 @@ namespace FactorySystemApi.Controllers
                         BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项
                         BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程
 
+                        HalfMaterialTaskBll halfMaterialTaskBll = new HalfMaterialTaskBll();
+                        halfMaterialTaskBll.CloseHalfMaterialTask(teamId, userId, (int)Constant.HalfMaterialProcessType.BOM下载);
+
                         OperateLogBll.Add(teamwork.FID, 2, "BOM下载成功", userId);
                         HalfMaterialTeamworkBll.ChangeTeamProcess(teamwork.FID);
                         result = 1;

FactorySystemApi/Controllers/ViewController.cs

@@ -333,15 +333,24 @@ namespace FactorySystemApi.Controllers
                         //BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2);
                         HalfMaterialTaskBll halfMaterialTaskBll= new HalfMaterialTaskBll();
 
-                        BaseBll.CreateTaskData2(teamwork.FID, user.FID, "3"); //新增物料分类事项
                         if (inParam["FType"].ToString() == "2")
                         {
-                            halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料编辑);
                             BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料编辑, 2, 2);
+
+                            TFS_HalfMaterialTask tFS_HalfMaterialTask = BaseBll.GetTempModel<TFS_HalfMaterialTask>(string.Format("FTeamID={0} AND FType=3", teamId));
+
+                            if (tFS_HalfMaterialTask == null) 
+                            {
+                                BaseBll.CreateTaskData2(teamwork.FID, user.FID, "3");
+                            }
+
                         }
                         else if (inParam["FType"].ToString() == "3")
                         {
                             BaseBll.UpdateTeamProcess2(teamwork.FID, (int)Constant.HalfMaterialProcessType.物料确认, 2, 2);
+
+                            halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料编辑);
+
                             halfMaterialTaskBll.CloseHalfMaterialTask(teamId, user.FID, (int)Constant.HalfMaterialProcessType.物料确认);
 
                             HalfMaterialTeamworkBll halfMaterialTeamworkBll = new HalfMaterialTeamworkBll();